diff --git a/pom.xml b/pom.xml
index 7f428bd9b..467ccea4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
chronicle-map
- 3.20.84
+ 3.20.84.1-SNAPSHOT
OpenHFT/Chronicle-Map
Chronicle-Map
bundle
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicatedQueryAlloc.java b/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicatedQueryAlloc.java
index 833c95590..3c2e0c78c 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicatedQueryAlloc.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicatedQueryAlloc.java
@@ -23,6 +23,7 @@ import net.openhft.chronicle.hash.replication.ReplicableEntry;
import net.openhft.chronicle.map.MapAbsentEntry;
import net.openhft.chronicle.map.MapSegmentContext;
import net.openhft.chronicle.map.ReplicatedChronicleMap;
+import net.openhft.chronicle.map.impl.CompiledReplicatedMapQueryContext;
import net.openhft.chronicle.map.impl.IterationContext;
import net.openhft.chronicle.map.impl.ReplicatedChronicleMapHolder;
import net.openhft.sg.StageRef;
@@ -73,6 +74,14 @@ public class ReplicatedQueryAlloc extends QueryAlloc {
long firstAttemptedTierIndex = s.tierIndex;
long firstAttemptedTierBaseAddr = s.tierBaseAddr;
boolean cleanedFirstAttemptedTier = forcedOldDeletedEntriesCleanup(prevPos);
+
+ if (cleanedFirstAttemptedTier) {
+ // Force recalculation of some properties as new slots may
+ // have become available and there might be "holes"
+ // created by removed entries.
+ ((CompiledReplicatedMapQueryContext) (Object) this).closeSearchKey();
+ }
+
s.goToFirstTier();
while (true) {
boolean visitingFirstAttemptedTier = s.tier == firstAttemptedTier;