diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index a8da7eb80..a2538010c 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -429,6 +429,11 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
             }
         }
 
+        @Override
+        void beforeRelocation() {
+            m().dropChange(segmentIndex, pos);
+        }
+
         @Override
         boolean freeListBitsSet() {
             // As of now, ReplicatedChMap's remove() never clear the bits
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index 320e0157d..02cef950d 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -1367,8 +1367,9 @@ final class TcpReplicator<K, V> extends AbstractChannelReplicator implements Clo
                                 }
                             }
                         }
-                    } else
+                    } else {
                         externalizable.readExternalEntry(context, out);
+                    }
 
                     out.limit(limit);
 
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java
index 62ed81f0b..f3c548610 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java
@@ -31,7 +31,6 @@ import java.util.Random;
 import java.util.Set;
 
 import static net.openhft.chronicle.map.Builder.newTcpSocketShmBuilder;
-import static net.openhft.chronicle.map.TCPSocketReplication4WayMapTest.newTcpSocketShmIntString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;