diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index 0285753fc3..1f58c1888b 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -733,6 +733,7 @@ public class BrokerService implements Service {
             // Clear SelectorParser cache to free memory
             SelectorParser.clearCache();
         } finally {
+            started.set(false);
             stopped.set(true);
             stoppedLatch.countDown();
         }