diff --git a/deps/db/src/logseq/db/sqlite/create_graph.cljs b/deps/db/src/logseq/db/sqlite/create_graph.cljs
index c5b69e094a..fdc38e449d 100644
--- a/deps/db/src/logseq/db/sqlite/create_graph.cljs
+++ b/deps/db/src/logseq/db/sqlite/create_graph.cljs
@@ -232,7 +232,7 @@
 (defn build-db-initial-data
   "Builds tx of initial data for a new graph including key values, initial files,
    built-in properties and built-in classes"
-  [config-content & {:keys [import-type graph-git-sha remote-graph?]}]
+  [config-content & {:keys [import-type graph-git-sha creating-remote-graph?]}]
   (assert (string? config-content))
   (let [initial-data (cond->
                       [(sqlite-util/kv :logseq.kv/db-type "db")
@@ -246,8 +246,8 @@
                        (into (sqlite-util/import-tx import-type))
                        graph-git-sha
                        (conj (sqlite-util/kv :logseq.kv/graph-git-sha graph-git-sha))
-                       remote-graph?
-                       (conj (sqlite-util/kv :logseq.kv/graph-remote? remote-graph?))
+                       creating-remote-graph?
+                       (conj (sqlite-util/kv :logseq.kv/graph-remote? creating-remote-graph?))
                        true
                        (conj (sqlite-util/kv :logseq.kv/local-graph-uuid
                                              (uuid (str "00000000" (subs (str (common-uuid/gen-uuid)) 8))))))
diff --git a/src/main/frontend/components/repo.cljs b/src/main/frontend/components/repo.cljs
index 9a478fd677..b36ad98d0c 100644
--- a/src/main/frontend/components/repo.cljs
+++ b/src/main/frontend/components/repo.cljs
@@ -488,7 +488,7 @@
                        (do
                          (set-creating-db? true)
                          (p/let [repo (repo-handler/new-db! graph-name
-                                                            {:remote-graph? cloud?})]
+                                                            {:creating-remote-graph? cloud?})]
                            (when cloud?
                              (->
                               (p/do
diff --git a/src/main/frontend/handler/repo.cljs b/src/main/frontend/handler/repo.cljs
index 1de257d353..8ab9b16e46 100644
--- a/src/main/frontend/handler/repo.cljs
+++ b/src/main/frontend/handler/repo.cljs
@@ -132,13 +132,13 @@
   (let [full-graph-name (string/lower-case (str config/db-version-prefix graph-name))]
     (some #(= (some-> (:url %) string/lower-case) full-graph-name) (state/get-repos))))
 
-(defn- create-db [full-graph-name {:keys [file-graph-import? remote-graph?]}]
+(defn- create-db [full-graph-name {:keys [file-graph-import? creating-remote-graph?]}]
   (->
    (p/let [config config/config-default-content
            _ (persist-db/<new full-graph-name
                               (cond-> {:config config
                                        :graph-git-sha (build-version/revision)
-                                       :remote-graph? remote-graph?}
+                                       :creating-remote-graph? creating-remote-graph?}
                                 file-graph-import? (assoc :import-type :file-graph)))
            _ (start-repo-db-if-not-exists! full-graph-name)
            _ (state/add-repo! {:url full-graph-name :root (config/get-local-dir full-graph-name)})
diff --git a/src/main/frontend/worker/db_core.cljs b/src/main/frontend/worker/db_core.cljs
index 5599ddac72..84733bba62 100644
--- a/src/main/frontend/worker/db_core.cljs
+++ b/src/main/frontend/worker/db_core.cljs
@@ -408,7 +408,9 @@
                       :skip-validate-db? true}))))
 
 (defn- <create-or-open-db!
-  [repo {:keys [config datoms sync-download-graph?] :as opts}]
+  [repo {:keys [config datoms sync-download-graph? creating-remote-graph?] :as opts}]
+  (when creating-remote-graph?
+    (client-op/update-local-tx repo 0))
   (when-not (worker-state/get-sqlite-conn repo)
     (p/let [[db search-db client-ops-db :as dbs] (get-dbs repo)
             storage (new-sqlite-storage db)]
@@ -453,14 +455,12 @@
         (when-not @*publishing?
           (client-op/ensure-sqlite-schema! client-ops-db))
         (ensure-client-ops-cleanup-timer! repo)
-        (when (nil? (client-op/get-local-tx repo))
-          (client-op/update-local-tx repo 0))
         (let [initial-tx-report (when-not (or initial-data-exists?
                                               (seq datoms)
                                               sync-download-graph?)
                                   (let [config (resolve-initial-config config)
                                         initial-data (sqlite-create-graph/build-db-initial-data
-                                                      config (select-keys opts [:import-type :graph-git-sha :remote-graph?]))]
+                                                      config (select-keys opts [:import-type :graph-git-sha :creating-remote-graph?]))]
                                     (ldb/transact! conn initial-data
                                                    {:initial-db? true})))]
           (when-not sync-download-graph?