diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index c8479e7011..5c50982f05 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -1223,6 +1223,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
          for (ActiveMQComponent component : this.protocolServices) {
             stopComponent(component);
          }
+         protocolServices.clear();
 
          final RemotingService remotingService = this.remotingService;
          if (remotingService != null) {