diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 3aeaad318..5653c4f75 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -408,7 +408,7 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
         }
         
         if (!QUIET) {
-            if (!isClientDb()) {
+            if (!isClientDb() && !_context.commSystem().isDummy()) {
                 // fill the search queue with random keys in buckets that are too small
                 // Disabled since KBucketImpl.generateRandomKey() is b0rked,
                 // and anyway, we want to search for a completely random key,