diff --git a/src/stores/CustomRoomTagStore.js b/src/stores/CustomRoomTagStore.js
index 1983fa7462..d898b5d32a 100644
--- a/src/stores/CustomRoomTagStore.js
+++ b/src/stores/CustomRoomTagStore.js
@@ -113,7 +113,8 @@ class CustomRoomTagStore extends EventEmitter {
             }
             break;
             case 'on_logged_out': {
-                this._state = {};
+                // we assume to always have a tags object in the state
+                this._state = {tags: {}};
                 if (this._roomListStoreToken) {
                     this._roomListStoreToken.remove();
                     this._roomListStoreToken = null;