Merge pull request #6874 from matrix-org/t3chguy/spaces-null-guard-cl…

…ient
matrix-org · Sep 28, 2021 · 540593e · 540593e
2 parents 8e497f8 + d71f234
commit 540593e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
@@ -818,7 +818,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     protected async onAction(payload: ActionPayload) {
-        if (!spacesEnabled) return;
+        if (!spacesEnabled || !this.matrixClient) return;
         switch (payload.action) {
             case "view_room": {
                 // Don't auto-switch rooms when reacting to a context-switch