diff --git a/src/domain/SessionLoadViewModel.js b/src/domain/SessionLoadViewModel.js
index d40b7f08..10f4f7ee 100644
--- a/src/domain/SessionLoadViewModel.js
+++ b/src/domain/SessionLoadViewModel.js
@@ -25,7 +25,7 @@ export class SessionLoadViewModel extends ViewModel {
                 this.emitChange();
                 // wait for initial sync, but not catchup sync
                 const isCatchupSync = s === LoadStatus.FirstSync &&
-                    this._sessionContainer.sync.status === SyncStatus.CatchupSync;
+                    this._sessionContainer.sync.status.get() === SyncStatus.CatchupSync;
                 return isCatchupSync ||
                     s === LoadStatus.LoginFailed ||
                     s === LoadStatus.Error ||
diff --git a/src/matrix/SessionContainer.js b/src/matrix/SessionContainer.js
index 5468ba70..c9d8af90 100644
--- a/src/matrix/SessionContainer.js
+++ b/src/matrix/SessionContainer.js
@@ -159,8 +159,8 @@ export class SessionContainer {
 
     async _waitForFirstSync() {
         try {
-            this._status.set(LoadStatus.FirstSync);
             this._sync.start();
+            this._status.set(LoadStatus.FirstSync);
         } catch (err) {
             // swallow ConnectionError here and continue,
             // as the reconnector above will call