diff --git a/lib/namespace.js b/lib/namespace.js
index e3eaee0a..e4c45bc2 100644
--- a/lib/namespace.js
+++ b/lib/namespace.js
@@ -214,11 +214,14 @@ SocketNamespace.prototype.handlePacket = function (sessid, packet) {
 
   switch (packet.type) {
     case 'connect':
-      this.store.join(sessid, this.name, function () {
-        // packet echo
-        socket.packet({ type: 'connect' });
-        self.emit('connection', socket);
-      });
+      this.manager.onJoin(sessid, this.name);
+      this.store.publish('join', sessid, this.name);
+
+      // packet echo
+      socket.packet({ type: 'connect' });
+
+      // emit connection event
+      self.emit('connection', socket);
       break;
 
     case 'ack':