diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart
index 70a3a1f..01e46ad 100644
--- a/lib/components/matrix.dart
+++ b/lib/components/matrix.dart
@@ -87,13 +87,16 @@ class MatrixState extends State<Matrix> {
     try {
       client.database = await getDatabase(client);
       await client.connect();
-      if (await initLoginState == LoginState.logged && PlatformInfos.isMobile) {
-        await FirebaseController.setupFirebase(
-          this,
-          widget.clientName,
-        );
+      final firstLoginState = await initLoginState;
+      if (firstLoginState == LoginState.logged) {
+        _cleanUpUserStatus(userStatuses);
+        if (PlatformInfos.isMobile) {
+          await FirebaseController.setupFirebase(
+            this,
+            widget.clientName,
+          );
+        }
       }
-      _cleanUpUserStatus(userStatuses);
     } catch (e, s) {
       client.onLoginStateChanged.sink.addError(e, s);
       captureException(e, s);