diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
index 78e230dd..cedab003 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
@@ -2,6 +2,7 @@ package org.dna.mqtt.moquette.server;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Level;
 import org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging;
 //import org.dna.mqtt.moquette.server.mina.MinaAcceptor;
 import org.dna.mqtt.moquette.server.netty.NettyAcceptor;
@@ -44,10 +45,19 @@ public class Server {
         m_acceptor.initialize(messaging);
     }
     
+    /**
+     * It's an asynchronous method, it's only a request to stop
+     */
     public void stopServer() {
         System.out.println("Server stopping...");
         messaging.stop();
         m_acceptor.close();
         System.out.println("Server stopped");
+        try {
+            //sleep one second to give the disruptor
+            Thread.sleep(100);
+        } catch (InterruptedException ex) {
+            LOG.error(null, ex);
+        }
     }
 }