Merge pull request #6972 from matrix-org/t3chguy/fix/19359

matrix-org · Oct 19, 2021 · 6ea3227 · 6ea3227
2 parents f8b6f13 + eeec9b1
commit 6ea3227
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
@@ -275,8 +275,11 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
             <AccessibleButton
                 kind="primary"
                 onClick={() => {
-                    setBusy(true);
                     onJoinButtonClicked();
+                    if (!cli.isGuest()) {
+                        // user will be shown a modal that won't fire a room join error
+                        setBusy(true);
+                    }
                 }}
                 disabled={!spacesEnabled || cannotJoin}
             >