1 files changed, 6 insertions, 0 deletions
diff --git a/src/swarm/sync.rs b/src/swarm/sync.rs
index 3284015..58a08db 100644
--- a/src/swarm/sync.rs
+++ b/src/swarm/sync.rs
@@ -32,6 +32,12 @@ pub(crate) struct ChangeSet {
 }
 
 async fn deliver_sync_to_peer(state: &AppState, peer: &str) -> Result<()> {
+    if state.remake.fetching_snapshot() {
+        // Rejoining: the snapshot comes as a download, not in a sync message. Sync
+        // starts once it is here (`remake::catchup`).
+        trace!("Waiting for the snapshot download; not syncing yet");
+        return Ok(());
+    }
     let Some(peer_state_mutex) = state.get_peer_state(peer).await else {
         trace!("Peer was forgotten; skipping synchronization");
         return Ok(());