diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java
index 84fca4fddf..be2705d74b 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java
@@ -50,7 +50,7 @@ public SearchReplyJob(RouterContext enclosingContext, SearchJob job, DatabaseSea
     public String getName() { return "Process Reply for Kademlia Search"; }
 
     public void runJob() {
-        int count = _msg.getNumReplies();
+        int count = Math.min(_msg.getNumReplies(), 2 * SingleLookupJob.MAX_TO_FOLLOW);
         for (int i = 0; i < count; i++) {
             processPeer(i);
         }