diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java
index 7bd00364..55b794cb 100644
--- a/broker/src/main/java/io/moquette/server/Server.java
+++ b/broker/src/main/java/io/moquette/server/Server.java
@@ -255,7 +255,9 @@ public class Server {
             }
         }
 
-        scheduler.shutdown();
+		// calling shutdown() does not actually stop tasks that are not cancelled,
+		// and SessionsRepository does not stop its tasks. Thus shutdownNow().
+        scheduler.shutdownNow();
 
         LOG.info("Moquette server has been stopped.");
     }