diff --git a/lib/pages/chat_list.dart b/lib/pages/chat_list.dart
index 89ec3435..a6cd721a 100644
--- a/lib/pages/chat_list.dart
+++ b/lib/pages/chat_list.dart
@@ -423,6 +423,12 @@ class ChatListController extends State<ChatList> {
         _activeSpaceId = null;
         selectedRoomIds.clear();
         Matrix.of(context).activeBundle = bundle;
+        if (!Matrix.of(context)
+            .currentBundle
+            .any((client) => client == Matrix.of(context).client)) {
+          Matrix.of(context)
+              .setActiveClient(Matrix.of(context).currentBundle.first);
+        }
       });
 
   void editBundlesForAccount(String userId) async {