diff --git a/lib/pages/chat_list.dart b/lib/pages/chat_list.dart
index 6ff66583..580973d1 100644
--- a/lib/pages/chat_list.dart
+++ b/lib/pages/chat_list.dart
@@ -386,6 +386,8 @@ class ChatListController extends State<ChatList> {
 
   Future<void> waitForFirstSync() async {
     final client = Matrix.of(context).client;
+    await client.roomsLoading;
+    await client.accountDataLoading;
     if (client.prevBatch?.isEmpty ?? true) {
       await client.onFirstSync.stream.first;
     }
diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart
index 1fdb219b..80575ff9 100644
--- a/lib/utils/client_manager.dart
+++ b/lib/utils/client_manager.dart
@@ -37,7 +37,10 @@ abstract class ClientManager {
     }
     final clients = clientNames.map(createClient).toList();
     await Future.wait(clients.map((client) => client
-        .init(waitForFirstSync: false)
+        .init(
+          waitForFirstSync: false,
+          waitUntilFullLoaded: false,
+        )
         .catchError((e, s) => Logs().e('Unable to initialize client', e, s))));
     if (clients.length > 1 && clients.any((c) => !c.isLogged())) {
       final loggedOutClients = clients.where((c) => !c.isLogged()).toList();
diff --git a/pubspec.lock b/pubspec.lock
index eed91fd7..8acbc6d2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -752,9 +752,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      name: matrix
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "."
+      ref: "krille/improve-start-up-time"
+      resolved-ref: "6585cf195f414175c72693f720569d9ce68319d2"
+      url: "https://gitlab.com/famedly/company/frontend/famedlysdk.git"
+    source: git
     version: "0.7.0-nullsafety.3"
   matrix_api_lite:
     dependency: "direct overridden"
diff --git a/pubspec.yaml b/pubspec.yaml
index 772c195e..d6002869 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -112,5 +112,9 @@ dependency_overrides:
     hosted:
       name: geolocator_android
       url: https://hanntech-gmbh.gitlab.io/free2pass/flutter-geolocator-floss
+  matrix:
+    git:
+      url: https://gitlab.com/famedly/company/frontend/famedlysdk.git
+      ref: krille/improve-start-up-time
   matrix_api_lite: ^0.5.0
-  provider: 5.0.0
+  provider: 5.0.0
\ No newline at end of file