diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 457711c160..94c29a58b4 100644
--- a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -273,14 +273,14 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
                 }
                 startedLatch.countDown();
                 localStartedLatch.countDown();
+            }
 
-                safeWaitUntilStarted();
+            safeWaitUntilStarted();
 
-                if (!disposed.get()) {
-                    setupStaticDestinations();
-                } else {
-                    LOG.warn("Network connection between " + localBroker + " and " + remoteBroker + "(" + remoteBrokerName + ") was interrupted during establishment.");
-                }
+            if (!disposed.get()) {
+                setupStaticDestinations();
+            } else {
+                LOG.warn("Network connection between " + localBroker + " and " + remoteBroker + "(" + remoteBrokerName + ") was interrupted during establishment.");
             }
         }
     }