diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs
index 4383963115..6f5086c5a5 100644
--- a/src/main/frontend/fs/sync.cljs
+++ b/src/main/frontend/fs/sync.cljs
@@ -2958,10 +2958,10 @@
                                    (fn [_ _ _ n]
                                      (state/set-file-sync-state repo n)))
 
-                        (.start sm)
-
                         (state/set-state! [:file-sync/graph-state :current-graph-uuid] graph-uuid)
 
+                        (.start sm)
+
                         (offer! remote->local-full-sync-chan true)
                         (offer! full-sync-chan true)
                         (swap! *sync-starting? assoc graph-uuid false))))))
diff --git a/src/main/frontend/handler/file_sync.cljs b/src/main/frontend/handler/file_sync.cljs
index 2344394443..807a06f1b0 100644
--- a/src/main/frontend/handler/file_sync.cljs
+++ b/src/main/frontend/handler/file_sync.cljs
@@ -199,7 +199,8 @@
             (state/set-state! [:file-sync/graph-state current-uuid :file-sync/last-synced-at] (:epoch data)))
 
           :start
-          (state/set-state! [:file-sync/graph-state current-uuid :file-sync/start-time] data)
+          (when-let [current-uuid (state/get-current-file-sync-graph-uuid)]
+            (state/set-state! [:file-sync/graph-state current-uuid :file-sync/start-time] data))
 
           nil)