diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 62603e86a..4a204c404 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -454,11 +454,7 @@ class ChatController extends State<ChatPageWithRoom>
       }
     }
     timeline!.requestKeys(onlineKeyBackupOnly: false);
-    if (!room.isSpace &&
-        room.membership == Membership.join &&
-        room.markedUnread) {
-      room.markUnread(false);
-    }
+    if (room.markedUnread) room.markUnread(false);
 
     // when the scroll controller is attached we want to scroll to an event id, if specified
     // and update the scroll controller...which will trigger a request history, if the
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 2639be184..1fde5f0f8 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -229,7 +229,10 @@ class _SpaceViewState extends State<SpaceView> {
           ),
       message: spaceChild?.topic ?? room?.topic,
       actions: [
+        // #Pangea
+        // if (room == null)
         if (room == null || room.membership == Membership.leave)
+          // Pangea#
           SheetAction(
             key: SpaceChildContextAction.join,
             label: L10n.of(context)!.joinRoom,
@@ -304,7 +307,6 @@ class _SpaceViewState extends State<SpaceView> {
         } else {
           widget.controller.toggleSelection(room.id);
           await widget.controller.leaveAction();
-          widget.controller.toggleSelection(room.id);
         }
         _refresh();
         break;
@@ -344,7 +346,6 @@ class _SpaceViewState extends State<SpaceView> {
         } else {
           widget.controller.toggleSelection(room.id);
           await widget.controller.archiveAction();
-          widget.controller.toggleSelection(room.id);
         }
         // Pangea#
         _refresh();
diff --git a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart b/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
index 14ee5f4ce..e71ed8f4f 100644
--- a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
@@ -71,8 +71,8 @@ extension ClassAndExchangeSettingsRoomExtension on Room {
       }
       final spaceChildPower =
           currentPowerContent["events"][EventTypes.spaceChild];
-      final studentAnalyticsPower =
-          currentPowerContent[PangeaEventTypes.studentAnalyticsSummary];
+      final studentAnalyticsPower = currentPowerContent["events"]
+          [PangeaEventTypes.studentAnalyticsSummary];
 
       if ((spaceChildPower == null || studentAnalyticsPower == null)) {
         currentPowerContent["events"][EventTypes.spaceChild] = 0;