diff --git a/broker/src/main/java/io/moquette/broker/Server.java b/broker/src/main/java/io/moquette/broker/Server.java
index a11c49c73..5e70ddda1 100644
--- a/broker/src/main/java/io/moquette/broker/Server.java
+++ b/broker/src/main/java/io/moquette/broker/Server.java
@@ -332,6 +332,8 @@ public void stopServer() {
         // and SessionsRepository does not stop its tasks. Thus shutdownNow().
         scheduler.shutdownNow();
 
+        interceptor.stop();
+
         if (h2Builder != null) {
             LOG.trace("Shutting down H2 persistence {}");
             h2Builder.closeStore();
diff --git a/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java b/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java
index 79d7cb09f..baad17502 100644
--- a/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java
+++ b/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java
@@ -77,7 +77,7 @@ public BrokerInterceptor(IConfig props, List<InterceptHandler> handlers) {
     /**
      * Shutdown graciously the executor service
      */
-    void stop() {
+    public void stop() {
         LOG.info("Shutting down interceptor thread pool...");
         executor.shutdown();
         try {
diff --git a/build.gradle b/build.gradle
index b6f83855d..a966f0ee1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ subprojects {
   apply plugin: 'eclipse'
 
   ext {
-    nettyVersion = '4.1.22.Final'
+    nettyVersion = '4.1.50.Final'
   }
 
   task packageTests(type: Jar) {