diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index 119491828..f94f6a6a2 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -388,7 +388,7 @@ final class TcpReplicator<K, V> extends AbstractChannelReplicator implements Clo
 
         final Attached attached = (Attached) key.attachment();
 
-        if (attached.isServer && !attached.isHandShakingComplete())
+        if (!attached.isServer || !attached.isHandShakingComplete())
             return;
 
         final SocketChannel channel = (SocketChannel) key.channel();
@@ -412,6 +412,7 @@ final class TcpReplicator<K, V> extends AbstractChannelReplicator implements Clo
             if (replicationConfig.autoReconnectedUponDroppedConnection())
                 attached.connector.connectLater();
         }
+
     }
 
     /**