1 files changed, 8 insertions, 7 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 1fd9b9bc..6dfa62ef 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -20,7 +20,6 @@
 #include <QMessageBox>
 #include <QSettings>
 #include <QShortcut>
-#include <QtConcurrent>
 
 #include <mtx/responses.hpp>
 
@@ -281,10 +280,12 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                 &ChatPage::setGroupViewState);
 
         connect(this, &ChatPage::initializeRoomList, room_list_, &RoomList::initialize);
-        connect(this,
-                &ChatPage::initializeViews,
-                view_manager_,
-                [this](const mtx::responses::Rooms &rooms) { view_manager_->sync(rooms); });
+        connect(
+          this,
+          &ChatPage::initializeViews,
+          view_manager_,
+          [this](const mtx::responses::Rooms &rooms) { view_manager_->sync(rooms); },
+          Qt::QueuedConnection);
         connect(this,
                 &ChatPage::initializeEmptyViews,
                 view_manager_,
@@ -522,8 +523,6 @@ ChatPage::bootstrap(QString userid, QString homeserver, QString token)
 void
 ChatPage::loadStateFromCache()
 {
-        emit contentLoaded();
-
         nhlog::db()->info("restoring state from cache");
 
         try {
@@ -555,6 +554,8 @@ ChatPage::loadStateFromCache()
 
         getProfileInfo();
 
+        emit contentLoaded();
+
         // Start receiving events.
         emit trySyncCb();
 }