diff --git a/package.json b/package.json
index bb8db64d28..9d5013de28 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
     "sinon": "^1.17.3",
-    "source-map-loader": "^0.1.5",
+    "source-map-loader": "^0.1.6",
     "walk": "^2.3.9",
     "webpack": "^1.12.14"
   }
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 4a491c8a03..41a200420d 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -191,6 +191,10 @@ module.exports = React.createClass({
             this._tagStoreToken.remove();
         }
 
+        if (this._roomListStoreToken) {
+            this._roomListStoreToken.remove();
+        }
+
         if (this._groupStoreTokens.length > 0) {
             // NB: GroupStore is not a Flux.Store
             this._groupStoreTokens.forEach((token) => token.unregister());