diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java
index ae85951ec03deeacf7bac393e590814413e130e9..0cc3f4389cede425dba5073e2ff68fdd27bfaeec 100644
--- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java
+++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java
@@ -175,7 +175,9 @@ public class HandleDatabaseLookupMessageJob extends JobImpl {
         } else if (type == DatabaseEntry.KEY_TYPE_ROUTERINFO &&
                    lookupType != DatabaseLookupMessage.Type.LS) {
             RouterInfo info = (RouterInfo) dbe;
-            if (info.isCurrent(EXPIRE_DELAY)) {
+            if (searchKey.equals(getContext().routerHash())) {
+                sendData(searchKey, info, fromKey, toTunnel);
+            } else if (info.isCurrent(EXPIRE_DELAY)) {
                 if ( (info.isHidden()) || (isUnreachable(info) && !publishUnreachable()) ) {
                     if (_log.shouldLog(Log.DEBUG))
                         _log.debug("Not answering a query for a netDb peer who isn't reachable");