diff --git a/lib/pangea/public_spaces/pangea_public_room_bottom_sheet.dart b/lib/pangea/public_spaces/pangea_public_room_bottom_sheet.dart
index 9551f4958..e33a34445 100644
--- a/lib/pangea/public_spaces/pangea_public_room_bottom_sheet.dart
+++ b/lib/pangea/public_spaces/pangea_public_room_bottom_sheet.dart
@@ -93,7 +93,8 @@ class PangeaPublicRoomBottomSheetState
           serverName: via,
         );
 
-        if (client.getRoomById(roomId) == null) {
+        final room = client.getRoomById(roomId);
+        if (room == null || room.membership != Membership.join) {
           await client.waitForRoomInSync(roomId, join: true);
         }
         return roomId;