diff --git a/src/main/frontend/db/persist.cljs b/src/main/frontend/db/persist.cljs
index 7e170a63a0..7767f5d2ca 100644
--- a/src/main/frontend/db/persist.cljs
+++ b/src/main/frontend/db/persist.cljs
@@ -8,10 +8,10 @@
             [logseq.common.config :as common-config]
             [promesa.core :as p]))
 
-(defn local-file-based-graph?
+(defn- local-file-based-graph?
   [s]
   (and (string? s)
-       (string/starts-with? s common-config/file-version-prefix)))
+       (string/starts-with? s (str common-config/db-version-prefix common-config/file-version-prefix))))
 
 (defn get-all-graphs
   []
@@ -27,9 +27,9 @@
     (distinct
      (concat
       repos'
-      (map (fn [repo-name]
-             {:name (common-config/canonicalize-db-version-repo repo-name)})
-           (some-> electron-disk-graphs bean/->clj))))))
+      (->> (some-> electron-disk-graphs bean/->clj)
+           (map (fn [repo-name]
+                  {:name (common-config/canonicalize-db-version-repo repo-name)})))))))
 
 (defn delete-graph!
   [graph]
diff --git a/src/test/frontend/db/persist_test.cljs b/src/test/frontend/db/persist_test.cljs
index 6fce792a8a..557ce4edf1 100644
--- a/src/test/frontend/db/persist_test.cljs
+++ b/src/test/frontend/db/persist_test.cljs
@@ -12,7 +12,7 @@
                                               (p/resolved [{:name "demo"}
                                                            {:name "logseq_db_prefixed"}
                                                            {:name "logseq_db_logseq_db_legacy"}
-                                                           {:name "logseq_local_local-only"}]))
+                                                           {:name "logseq_db_logseq_local_local-only"}]))
                         util/electron? (constantly true)
                         ipc/ipc (fn [_channel]
                                   (p/resolved #js ["logseq_db_remote"
@@ -25,7 +25,8 @@
                      "logseq_db_remote"
                      "logseq_db_remote-legacy"}
                    (set names)))
-            (is (not-any? #(re-find #"^logseq_db_logseq_db_" %) names))))
+            (is (not-any? #(re-find #"^logseq_db_logseq_db_" %) names))
+            (is (not-any? #(re-find #"logseq_local_" %) names))))
         (p/catch (fn [error]
                    (is false (str error))))
         (p/finally done))))