diff --git a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
index 3f488f4b2..c46562886 100755
--- a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
+++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
@@ -411,7 +411,7 @@ public interface ChronicleHashBuilder<K, H extends ChronicleHash<K, ?, ?, ?>,
      * entry completely from the data structure. This timeout should depend on your distributed
      * system topology, and typical replication latencies, that should be determined experimentally.
      *
-     * <p>Default timeout is 1 second.
+     * <p>Default timeout is 1 minute.
      *
      * @param removedEntryCleanupTimeout timeout, after which stale removed entries could be erased
      *                                   from Chronicle Hash data structure completely
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index 7fcbc0250..7ec45e8c2 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -181,9 +181,15 @@ public final class ChronicleMapBuilder<K, V> implements
 
     // replication
     private TimeProvider timeProvider = MicrosecondPrecisionSystemTimeProvider.instance();
+    /**
+     * Default timeout is 1 minute. Even loopback tests converge often in the course of seconds,
+     * let alone WAN replication over many nodes might take tens of seconds.
+     *
+     * TODO review
+     */
     long cleanupTimeout = 1;
+    TimeUnit cleanupTimeoutUnit = TimeUnit.MINUTES;
     private boolean cleanupRemovedEntries = true;
-    TimeUnit cleanupTimeoutUnit = TimeUnit.SECONDS;
 
     private BytesMarshallerFactory bytesMarshallerFactory;
     private ObjectSerializer objectSerializer;