diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index 0753c90fe..a63cf23c5 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -315,10 +315,7 @@
 
     ptk/WatchEvent
     (watch [_ _ _]
-      (rx/merge
-       (rx/of (dwn/finalize file-id))
-       (->> (rx/of ::dwp/finalize)
-            (rx/observe-on :async))))))
+      (rx/of (dwn/finalize file-id)))))
 
 (declare go-to-page)
 (declare ^:private preload-data-uris)
diff --git a/frontend/src/app/main/data/workspace/persistence.cljs b/frontend/src/app/main/data/workspace/persistence.cljs
index 202548673..a18acb48c 100644
--- a/frontend/src/app/main/data/workspace/persistence.cljs
+++ b/frontend/src/app/main/data/workspace/persistence.cljs
@@ -40,7 +40,7 @@
     ptk/WatchEvent
     (watch [_ _ stream]
       (log/debug :hint "initialize persistence")
-      (let [stoper   (rx/filter #(= ::finalize %) stream)
+      (let [stoper   (rx/filter (ptk/type? ::initialize-persistence) stream)
             commits  (l/atom [])
 
             local-file?