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 fc09f1e944..ad3dba80be 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
@@ -1095,6 +1095,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
 
       sessions.clear();
 
+      activateCallbacks.clear();
+
       state = SERVER_STATE.STOPPED;
 
       activationLatch.setCount(1);
@@ -3113,4 +3115,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       }
    }
 
+   public Set<ActivateCallback> getActivateCallbacks() {
+      return activateCallbacks;
+   }
 }
\ No newline at end of file
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java
new file mode 100644
index 0000000000..273f21e7e4
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.tests.integration.server;
+
+import org.apache.activemq.artemis.core.server.ActivateCallback;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Test;
+
+/**
+ * A simple test-case used for documentation purposes.
+ */
+public class ClearActivateCallbackTest extends ActiveMQTestBase {
+
+   protected ActiveMQServer server;
+
+   @Test
+   public void simpleTest() throws Exception {
+      server = createServer(false, createDefaultNettyConfig());
+      server.start();
+      int initialCallbackCount = ((ActiveMQServerImpl) server).getActivateCallbacks().size();
+      server.registerActivateCallback(new ActivateCallback() {
+      });
+      assertEquals(1, ((ActiveMQServerImpl) server).getActivateCallbacks().size() - initialCallbackCount);
+      server.stop();
+      assertEquals(0, ((ActiveMQServerImpl) server).getActivateCallbacks().size());
+      server.start();
+      assertEquals(initialCallbackCount, ((ActiveMQServerImpl) server).getActivateCallbacks().size());
+   }
+}