diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
index 10261d2f46e4a0c68f1173ca83c9f3052f68687d..822b0b698274da7a6597919469570e41ea31cbd6 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
@@ -321,7 +321,8 @@ public class IterativeSearchJob extends FloodSearchJob {
                 // querying old floodfills that don't know about those sig types.
                 // This is also more recent than the version that supports encrypted replies,
                 // so we won't request unencrypted replies anymore either.
-                if (!StoreJob.shouldStoreTo(ri)) {
+                if (!StoreJob.shouldStoreTo(ri) ||
+                    (_isLease && !StoreJob.shouldStoreLS2To(ri))) {
                     failed(peer, false);
                     if (_log.shouldInfo())
                         _log.info(getJobId() + ": not sending query to old router: " + ri);