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 d298a24880..4241996fa5 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
@@ -347,34 +347,26 @@ public final class ReplicationManager implements ActiveMQComponent {
    }
 
    private OperationContext sendReplicatePacket(final Packet packet, boolean lineUp) {
-      if (!enabled)
+      if (!enabled) {
+         packet.release();
          return null;
-      boolean runItNow = false;
+      }
 
       final OperationContext repliToken = OperationContextImpl.getContext(executorFactory);
       if (lineUp) {
          repliToken.replicationLineUp();
       }
 
-      if (enabled) {
-         replicationStream.execute(() -> {
-            if (enabled) {
-               pendingTokens.add(repliToken);
-               flowControl(packet.expectedEncodeSize());
-               replicatingChannel.send(packet);
-            }
-         });
-      } else {
-         // Already replicating channel failed, so just play the action now
-         runItNow = true;
-         packet.release();
-      }
-
-      // Execute outside lock
-
-      if (runItNow) {
-         repliToken.replicationDone();
-      }
+      replicationStream.execute(() -> {
+         if (enabled) {
+            pendingTokens.add(repliToken);
+            flowControl(packet.expectedEncodeSize());
+            replicatingChannel.send(packet);
+         } else {
+            packet.release();
+            repliToken.replicationDone();
+         }
+      });
 
       return repliToken;
    }