diff --git a/src/main.rs b/src/main.rs
index 937196a..739c9aa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -898,6 +898,7 @@ async fn login_normal(
 ) -> IambResult<()> {
     println!("* Logging in for {}...", settings.profile.user_id);
     login(worker, settings).await?;
+    println!("* Syncing...");
     worker::do_first_sync(&worker.client, store)
         .await
         .map_err(IambError::from)?;
diff --git a/src/worker.rs b/src/worker.rs
index a585eab..9ca830c 100644
--- a/src/worker.rs
+++ b/src/worker.rs
@@ -1217,6 +1217,10 @@ impl ClientWorker {
             let settings = self.settings.clone();
 
             async move {
+                while !client.logged_in() {
+                    tokio::time::sleep(Duration::from_millis(100)).await;
+                }
+
                 let load = load_older_forever(&client, &store);
                 let rcpt = send_receipts_forever(&client, &store);
                 let room = refresh_rooms_forever(&client, &store);