diff --git a/package.json b/package.json
index 853db1d8..2e4333cd 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "engine.io": "1.4.0",
     "socket.io-parser": "2.2.1",
     "socket.io-client": "1.1.0",
-    "socket.io-adapter": "0.2.0",
+    "socket.io-adapter": "Automattic/socket.io-adapter#006f19",
     "has-binary-data": "0.1.3",
     "debug": "0.7.4"
   },
diff --git a/test/socket.io.js b/test/socket.io.js
index fa4882d1..ee3bb8c3 100644
--- a/test/socket.io.js
+++ b/test/socket.io.js
@@ -1291,6 +1291,24 @@ describe('socket.io', function(){
         });
       });
     });
+
+    it('deletes empty rooms', function(done) {
+      var srv = http();
+      var sio = io(srv);
+
+      srv.listen(function(){
+        var socket = client(srv);
+        sio.on('connection', function(s){
+          s.join('a', function(){
+            expect(s.nsp.adapter.rooms).to.have.key('a');
+            s.leave('a', function(){
+              expect(s.nsp.adapter.rooms).to.not.have.key('a');
+              done();
+            });
+          });
+        });
+      });
+    });
   });
 
   describe('middleware', function(done){