diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
index 02fd7a40d..2d03b2a2e 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
@@ -229,7 +229,10 @@ public abstract class TunnelPeerSelector extends ConnectChecker {
         if (ctx.commSystem().wasUnreachable(h))
             return true;
 
-        RouterInfo info = (RouterInfo) ctx.netDb().lookupLocallyWithoutValidation(h);
+        // Here, we use validation, because BuildRequestor does,
+        // so if we don't skip old routers here, it gets all the way to BuildRequestor
+        // before failing.
+        RouterInfo info = (RouterInfo) ctx.netDb().lookupLocally(h);
         if (info == null)
             return true;