diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
index 1d1217d616..6554cc8446 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -612,7 +612,7 @@ public final class ReplicationManager implements ActiveMQComponent {
    private void flushReplicationStream(FlushAction action) throws Exception {
       action.reset();
       replicationStream.execute(action);
-      if (!action.await(this.timeout, TimeUnit.MILLISECONDS)) {
+      if (!action.await(this.initialReplicationSyncTimeout, TimeUnit.MILLISECONDS)) {
          throw ActiveMQMessageBundle.BUNDLE.replicationSynchronizationTimeout(initialReplicationSyncTimeout);
       }
    }