diff --git a/server.js b/server.js
index c8c70b3..b59f55b 100644
--- a/server.js
+++ b/server.js
@@ -459,11 +459,12 @@ var logoutUser = function (request, response) {
     // Destroy any socket connections associated with this authToken.
     for (var clientId in io.sockets.sockets) {
       if (io.sockets.sockets[clientId].authToken == authToken) {
-        delete io.sockets.sockets[clientId];
+      cleanupSocket(io.sockets.sockets[clientId]); // Perform a better cleanup instead of the fast way below.
+      /*  delete io.sockets.sockets[clientId];
         // Delete any channel entries for this clientId.
         for (var channel in channels) {
           delete channels[channel].sessionIds[clientId];
-        }
+        } */
       }
     }
     response.send({'status': 'success'});