diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index b5dfa892fb..9d70e36d6a 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -274,14 +274,14 @@ module.exports = React.createClass({
         if (this._roomListStoreToken) {
             this._roomListStoreToken.remove();
         }
+        if (this._customTagStoreToken) {
+            this._customTagStoreToken.remove();
+        }
 
         // NB: GroupStore is not a Flux.Store
         if (this._groupStoreToken) {
             this._groupStoreToken.unregister();
         }
-        if (this._customTagStoreToken) {
-            this._customTagStoreToken.unregister();
-        }
 
         // cancel any pending calls to the rate_limited_funcs
         this._delayedRefreshRoomList.cancelPendingCall();