diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
index cd099cf6..3d6e369c 100644
--- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
@@ -938,4 +938,9 @@ public class ProtocolProcessor {
     public ISessionsStore getSessionsStore() {
         return m_sessionsStore;
     }
+
+    public void shutdown() {
+        if (m_interceptor != null)
+            m_interceptor.stop();
+    }
 }
diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java
index 44d1739f..74ca0ebe 100644
--- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java
@@ -254,8 +254,8 @@ public class ProtocolProcessorBootstrapper {
     public void shutdown() {
         if (storeShutdown != null)
             storeShutdown.run();
-//        if (m_interceptor != null)
-//            m_interceptor.stop();
+        if (m_processor != null)
+            m_processor.shutdown();
     }
 
     public ConnectionDescriptorStore getConnectionDescriptors() {