diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 7448982d5..389bcf477 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -166,6 +166,11 @@ class ChatListController extends State<ChatList>
       // Pangea#
       selectedRoomIds.clear();
       activeFilter = getActiveFilterByDestination(i);
+      // #Pangea
+      if (activeFilter != ActiveFilter.spaces) {
+        setActiveSpace(null);
+      }
+      // Pangea#
     });
     // #Pangea
     final bool clickedAllSpaces = (!AppConfig.separateChatTypes && i == 1) ||