diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 211d34df2..b6ee3c31a 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
     >
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 519ff9218..51561cf08 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -46,6 +46,7 @@ import '../../widgets/matrix.dart';
 import 'package:fluffychat/utils/tor_stub.dart'
     if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
 
+
 enum PopupMenuAction {
   settings,
   invite,
@@ -1177,7 +1178,13 @@ class ChatListController extends State<ChatList>
     // if (client.prevBatch == null) {
     if (client.onSync.value?.nextBatch == null) {
       // Pangea#
-      await client.onSync.stream.first;
+      await client.onSyncStatus.stream
+          .firstWhere((status) => status.status == SyncStatus.finished);
+
+      if (!mounted) return;
+      setState(() {
+        waitForFirstSync = true;
+      });
 
       // Display first login bootstrap if enabled
       // #Pangea
diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart
index e0bcf10f1..01d3c2184 100644
--- a/lib/pages/homeserver_picker/homeserver_picker.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker.dart
@@ -166,8 +166,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
       isLoading = true;
     });
     try {
-      final client = await Matrix.of(context).getLoginClient();
-      client.login(
+      await client.login(
         LoginType.mLoginToken,
         token: token,
         initialDeviceDisplayName: PlatformInfos.clientName,