diff --git a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
index da194422..6f8ad020 100755
--- a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
@@ -751,7 +751,7 @@ public class MemorySessionStore implements ISessionsStore {
     public void disableSession(String userId, String clientId) {
         Session session = sessions.get(clientId);
         if (session != null && session.getDeleted() == 0 && (userId == null || session.getUsername().equals(userId))) {
-            mServer.getProcessor().processOffline(session, false);
+            mServer.getProcessor().processOffline(session, false, null);
             databaseStore.updateSessionDeleted(session.getUsername(), clientId, 1);
             ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
             sessionSet.remove(clientId);
@@ -773,7 +773,7 @@ public class MemorySessionStore implements ISessionsStore {
             return;
         }
 
-        mServer.getProcessor().processOffline(session, true);
+        mServer.getProcessor().processOffline(session, true, null);
         ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
         sessionSet.remove(clientID);
 
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 47a647bc..ce0cb230 100755
--- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
@@ -620,19 +620,30 @@ public class ProtocolProcessor {
         String username = NettyUtils.userName(channel);
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
         if(session != null) {
-            processOffline(session, clearSession);
-        }
-
-        ConnectionDescriptor oldConnDescr = new ConnectionDescriptor(clientID, channel);
-        if(connectionDescriptors.removeConnection(oldConnDescr)) {
-            m_interceptor.notifyClientConnectionLost(clientID, username);
+            processOffline(session, clearSession, new Runnable() {
+                @Override
+                public void run() {
+                    ConnectionDescriptor oldConnDescr = new ConnectionDescriptor(clientID, channel);
+                    if(connectionDescriptors.removeConnection(oldConnDescr)) {
+                        m_interceptor.notifyClientConnectionLost(clientID, username);
+                    }
+                }
+            });
+        } else {
+            ConnectionDescriptor oldConnDescr = new ConnectionDescriptor(clientID, channel);
+            if(connectionDescriptors.removeConnection(oldConnDescr)) {
+                m_interceptor.notifyClientConnectionLost(clientID, username);
+            }
         }
     }
 
-    public void processOffline(MemorySessionStore.Session session, boolean clearSession) {
+    public void processOffline(MemorySessionStore.Session session, boolean clearSession, Runnable runnable) {
         if(session != null) {
             session.refreshLastActiveTime();
             forwardOnlineStatusEvent(session.getUsername(), session.getClientID(), session.getPlatform(), clearSession ? UserOnlineStatus.LOGOUT : UserOnlineStatus.OFFLINE, session.getAppName());
+            if(runnable != null) {
+                runnable.run();
+            }
             m_messagesStore.updateUserOnlineSetting(session, false);
         }
     }