diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index e9d16b7b8c..81d0b2ce99 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -104,6 +104,7 @@
              frontend.modules.outliner.core outliner-core
              frontend.mobile.util mobile-util
              frontend.page page
+             frontend.persist-db persist-db
              frontend.schema.handler.common-config common-config-schema
              frontend.search search
              frontend.state state
diff --git a/deps.edn b/deps.edn
index 74ca9e36db..907aa72a22 100644
--- a/deps.edn
+++ b/deps.edn
@@ -3,8 +3,8 @@
  {org.clojure/clojure                   {:mvn/version "1.11.1"}
   rum/rum                               {:mvn/version "0.12.9"}
 
-  datascript/datascript        {:git/url "https://github.com/logseq/datascript" ;; fork
-                                :sha     "ec937bc2bc932f0e1fdbbc1f67413d55c18ddc4a"}
+  datascript/datascript                 {:git/url "https://github.com/logseq/datascript" ;; fork
+                                         :sha     "15234c650df20844ec089c1738d28c00eccacd6e"}
 
   datascript-transit/datascript-transit {:mvn/version "0.3.0"}
   borkdude/rewrite-edn                  {:mvn/version "0.4.7"}
diff --git a/deps/common/package.json b/deps/common/package.json
index 8588a27f85..a4ffbd386a 100644
--- a/deps/common/package.json
+++ b/deps/common/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v1"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v2"
   },
   "scripts": {
     "test": "yarn nbb-logseq -cp test -m nextjournal.test-runner"
diff --git a/deps/common/yarn.lock b/deps/common/yarn.lock
index 6bd40cbfe8..3c18c2f3d3 100644
--- a/deps/common/yarn.lock
+++ b/deps/common/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v1":
-  version "1.2.173-feat-db-v1"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/e4910dfb12043404c97962d8faab3a946ab89f81"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v2":
+  version "1.2.173-feat-db-v2"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/9e891fd8a8a33ec78dd96a72bbdded191e1f0c1b"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/db/deps.edn b/deps/db/deps.edn
index 1ad88d0e9a..6474a4f740 100644
--- a/deps/db/deps.edn
+++ b/deps/db/deps.edn
@@ -1,7 +1,7 @@
 {:deps
  ;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
  {datascript/datascript {:git/url "https://github.com/logseq/datascript" ;; fork
-                         :sha     "3b578bb4b39efda730cdae5f8e679060101b5110"}
+                         :sha     "15234c650df20844ec089c1738d28c00eccacd6e"}
   com.cognitect/transit-cljs   {:mvn/version "0.8.280"}
   cljs-bean/cljs-bean          {:mvn/version "1.5.0"}}
  :aliases
diff --git a/deps/db/package.json b/deps/db/package.json
index 409cdef9cb..015c0fce5b 100644
--- a/deps/db/package.json
+++ b/deps/db/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v1"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v2"
   },
   "dependencies": {
     "better-sqlite3": "8.0.1"
diff --git a/deps/db/src/logseq/db/sqlite/db.cljs b/deps/db/src/logseq/db/sqlite/db.cljs
index 14fac7cc3b..2df1bf942b 100644
--- a/deps/db/src/logseq/db/sqlite/db.cljs
+++ b/deps/db/src/logseq/db/sqlite/db.cljs
@@ -52,12 +52,16 @@
 
 (defn upsert-addr-content!
   "Upsert addr+data-seq"
-  [db data]
+  [db data delete-addrs]
   (let [insert (.prepare db "INSERT INTO kvs (addr, content) values (@addr, @content) on conflict(addr) do update set content = @content")
+        delete (.prepare db "DELETE from kvs where addr = ?")
         insert-many (.transaction ^object db
                                   (fn [data]
                                     (doseq [item data]
-                                      (.run ^object insert item))))]
+                                      (.run ^object insert item))
+                                    (doseq [addr delete-addrs]
+                                      (when addr
+                                        (.run ^object delete addr)))))]
     (insert-many data)))
 
 (defn restore-data-from-addr
@@ -70,7 +74,7 @@
   "Creates a datascript storage for sqlite. Should be functionally equivalent to db-worker/new-sqlite-storage"
   [db]
   (reify IStorage
-    (-store [_ addr+data-seq]
+    (-store [_ addr+data-seq delete-addrs]
       (let [data (->>
                   (map
                    (fn [[addr data]]
@@ -78,7 +82,7 @@
                           :content (pr-str data)})
                    addr+data-seq)
                   (to-array))]
-        (upsert-addr-content! db data)))
+        (upsert-addr-content! db data delete-addrs)))
     (-restore [_ addr]
       (let [content (restore-data-from-addr db addr)]
         (edn/read-string content)))))
diff --git a/deps/db/yarn.lock b/deps/db/yarn.lock
index fec3493db2..f9cf0acf7f 100644
--- a/deps/db/yarn.lock
+++ b/deps/db/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v1":
-  version "1.2.173-feat-db-v1"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/e4910dfb12043404c97962d8faab3a946ab89f81"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v2":
+  version "1.2.173-feat-db-v2"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/9e891fd8a8a33ec78dd96a72bbdded191e1f0c1b"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/graph-parser/package.json b/deps/graph-parser/package.json
index 0b462b7250..56e9374be0 100644
--- a/deps/graph-parser/package.json
+++ b/deps/graph-parser/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v1",
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v2",
     "better-sqlite3": "8.0.1"
   },
   "dependencies": {
diff --git a/deps/graph-parser/yarn.lock b/deps/graph-parser/yarn.lock
index 13b86d9c99..0b1bcdba0e 100644
--- a/deps/graph-parser/yarn.lock
+++ b/deps/graph-parser/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v1":
-  version "1.2.173-feat-db-v1"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/e4910dfb12043404c97962d8faab3a946ab89f81"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v2":
+  version "1.2.173-feat-db-v2"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/9e891fd8a8a33ec78dd96a72bbdded191e1f0c1b"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/outliner/deps.edn b/deps/outliner/deps.edn
index b8ac37cffd..c4f21f759e 100644
--- a/deps/outliner/deps.edn
+++ b/deps/outliner/deps.edn
@@ -1,7 +1,7 @@
 {:deps
  ;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
  {datascript/datascript {:git/url "https://github.com/logseq/datascript" ;; fork
-                         :sha     "3b578bb4b39efda730cdae5f8e679060101b5110"}
+                         :sha     "15234c650df20844ec089c1738d28c00eccacd6e"}
   logseq/db             {:local/root "../db"}
   com.cognitect/transit-cljs {:mvn/version "0.8.280"}}
  :aliases
diff --git a/deps/outliner/package.json b/deps/outliner/package.json
index 77f34a6e12..590e1626f6 100644
--- a/deps/outliner/package.json
+++ b/deps/outliner/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v1"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v2"
   },
   "dependencies": {
     "better-sqlite3": "8.0.1"
diff --git a/deps/outliner/yarn.lock b/deps/outliner/yarn.lock
index 9209f2e203..00f7551efd 100644
--- a/deps/outliner/yarn.lock
+++ b/deps/outliner/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v1":
-  version "1.2.173-feat-db-v1"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/e4910dfb12043404c97962d8faab3a946ab89f81"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v2":
+  version "1.2.173-feat-db-v2"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/9e891fd8a8a33ec78dd96a72bbdded191e1f0c1b"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/publishing/package.json b/deps/publishing/package.json
index 78208d05d3..d70534df3c 100644
--- a/deps/publishing/package.json
+++ b/deps/publishing/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v1",
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v2",
     "mldoc": "^1.5.1"
   },
   "dependencies": {
diff --git a/deps/publishing/yarn.lock b/deps/publishing/yarn.lock
index 92d389e145..9595ffc1a3 100644
--- a/deps/publishing/yarn.lock
+++ b/deps/publishing/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v1":
-  version "1.2.173-feat-db-v1"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/e4910dfb12043404c97962d8faab3a946ab89f81"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v2":
+  version "1.2.173-feat-db-v2"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/9e891fd8a8a33ec78dd96a72bbdded191e1f0c1b"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/package.json b/package.json
index 8da8bf8628..b6475df162 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
         "@logseq/capacitor-file-sync": "5.0.1",
         "@logseq/diff-merge": "0.2.2",
         "@logseq/react-tweet-embed": "1.3.1-1",
-        "@logseq/sqlite-wasm": "=0.0.7",
+        "@logseq/sqlite-wasm": "=0.1.0",
         "@radix-ui/colors": "^0.1.8",
         "@sentry/react": "^6.18.2",
         "@sentry/tracing": "^6.18.2",
diff --git a/scripts/package.json b/scripts/package.json
index 952e9906d7..4a7581f330 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v1"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v2"
   },
   "dependencies": {
     "better-sqlite3": "8.0.1",
diff --git a/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj b/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj
index 0bac0addda..617b778620 100644
--- a/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj
+++ b/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj
@@ -15,7 +15,8 @@
         ["logseq.db.sqlite." "logseq.db.frontend.property" "logseq.db.frontend.malli-schema"
          "electron.db"
          "frontend.handler.db-based."
-         "frontend.components.property" "frontend.components.class" "frontend.components.db-based"]))
+         "frontend.components.property" "frontend.components.class" "frontend.components.db-based"
+         "frontend.persist-db"]))
 
 (def file-graph-ns
   "Namespaces or parent namespaces _only_ for file graphs"
@@ -34,6 +35,9 @@
    "src/main/frontend/components/property.cljs"
    "src/main/frontend/components/property"
    "src/main/frontend/components/db_based"
+   ;; TODO: Enable this when run-export-periodically is deleted or moved out of the ns
+   #_"src/main/frontend/persist_db.cljs"
+   "src/main/frontend/persist_db"
    "src/electron/electron/db.cljs"])
 
 (def file-graph-paths
diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 4bbaf67256..c038afd803 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v1":
-  version "1.2.173-feat-db-v1"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/e4910dfb12043404c97962d8faab3a946ab89f81"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v2":
+  version "1.2.173-feat-db-v2"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/9e891fd8a8a33ec78dd96a72bbdded191e1f0c1b"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/src/main/electron/listener.cljs b/src/main/electron/listener.cljs
index 33ab63ab97..2f04d77968 100644
--- a/src/main/electron/listener.cljs
+++ b/src/main/electron/listener.cljs
@@ -22,7 +22,7 @@
             [logseq.graph-parser.util :as gp-util]
             [promesa.core :as p]
             [frontend.handler.property.util :as pu]
-            [frontend.persist-db :as persistent-db]))
+            [frontend.persist-db :as persist-db]))
 
 (defn- safe-api-call
   "Force the callback result to be nil, otherwise, ipc calls could lead to
@@ -39,7 +39,7 @@
                           (notification/show! error :error))]
       (if (config/db-based-graph? repo)
         (->
-         (p/let [_ (persistent-db/<export-db repo {})]
+         (p/let [_ (persist-db/<export-db repo {})]
            (ipc/ipc "persistent-dbs-saved"))
          (p/catch error-handler))
         ;; TODO: Move all file based graphs to use the above persist approach
diff --git a/src/main/frontend/components/export.cljs b/src/main/frontend/components/export.cljs
index d5fa8df52f..3d676c58c8 100644
--- a/src/main/frontend/components/export.cljs
+++ b/src/main/frontend/components/export.cljs
@@ -1,6 +1,7 @@
 (ns frontend.components.export
   (:require [cljs-time.core :as t]
             ["/frontend/utils" :as utils]
+            [frontend.config :as config]
             [frontend.context.i18n :refer [t]]
             [frontend.db :as db]
             [frontend.handler.export.text :as export-text]
@@ -26,9 +27,10 @@
       [:li.mb-4
        [:a.font-medium {:on-click #(export/export-repo-as-json-v2! current-repo)}
         (t :export-json)]]
-      [:li.mb-4
-       [:a.font-medium {:on-click #(export/export-repo-as-sqlite-db! current-repo)}
-        (t :export-sqlite-db)]]
+      (when (config/db-based-graph? current-repo)
+       [:li.mb-4
+        [:a.font-medium {:on-click #(export/export-repo-as-sqlite-db! current-repo)}
+         (t :export-sqlite-db)]])
       (when (util/electron?)
         [:li.mb-4
          [:a.font-medium {:on-click #(export/download-repo-as-html! current-repo)}
diff --git a/src/main/frontend/components/repo.cljs b/src/main/frontend/components/repo.cljs
index b512b42d66..272093d7a8 100644
--- a/src/main/frontend/components/repo.cljs
+++ b/src/main/frontend/components/repo.cljs
@@ -150,7 +150,7 @@
     (p/let [multiple-windows? (ipc/ipc "graphHasMultipleWindows" (state/get-current-repo))]
       (reset! (::electron-multiple-windows? state) multiple-windows?))))
 
-(defn- repos-dropdown-links [repos current-repo *multiple-windows?]
+(defn- repos-dropdown-links [repos current-repo *multiple-windows? & {:as opts}]
   (let [switch-repos (if-not (nil? current-repo)
                        (remove (fn [repo] (= current-repo (:url repo))) repos) repos) ; exclude current repo
         repo-links (mapv
@@ -171,6 +171,8 @@
                                                          (ui/icon "cloud" {:size 18})])]
                            :hover-detail repo-url ;; show full path on hover
                            :options      {:on-click (fn [e]
+                                                      (when-let [on-click (:on-click opts)]
+                                                        (on-click e))
                                                       (if (gobj/get e "shiftKey")
                                                         (state/pub-event! [:graph/open-new-window url])
                                                         (if (or local? db-only?)
@@ -208,7 +210,7 @@
 
 (rum/defcs repos-dropdown < rum/reactive
   (rum/local false ::electron-multiple-windows?)
-  [state]
+  [state & {:as opts}]
   (let [multiple-windows? (::electron-multiple-windows? state)
         current-repo (state/sub :git/current-repo)
         login? (boolean (state/sub :auth/id-token))
@@ -218,7 +220,7 @@
             remotes (state/sub [:file-sync/remote-graphs :graphs])
             repos (if (and (seq remotes) login?)
                     (repo-handler/combine-local-&-remote-graphs repos remotes) repos)
-            links (repos-dropdown-links repos current-repo multiple-windows?)
+            links (repos-dropdown-links repos current-repo multiple-windows? opts)
             render-content (fn [{:keys [toggle-fn]}]
                              (let [remote? (:remote? (first (filter #(= current-repo (:url %)) repos)))
                                    repo-name (db/get-repo-name current-repo)
@@ -227,7 +229,7 @@
                                                      "Select a Graph")]
                                [:a.item.group.flex.items-center.p-2.text-sm.font-medium.rounded-md
 
-                                {:on-click (fn []
+                                {:on-click (fn [_e]
                                              (check-multiple-windows? state)
                                              (toggle-fn))
                                  :title    repo-name}       ;; show full path on hover
diff --git a/src/main/frontend/db/rtc/full_upload_download_graph.cljs b/src/main/frontend/db/rtc/full_upload_download_graph.cljs
index a654401754..8d9182710f 100644
--- a/src/main/frontend/db/rtc/full_upload_download_graph.cljs
+++ b/src/main/frontend/db/rtc/full_upload_download_graph.cljs
@@ -12,7 +12,8 @@
             [frontend.db.rtc.op-mem-layer :as op-mem-layer]
             [frontend.db.rtc.ws :refer [<send!]]
             [frontend.persist-db :as persist-db]
-            [logseq.db.frontend.schema :as db-schema]))
+            [logseq.db.frontend.schema :as db-schema]
+            [frontend.state :as state]))
 
 (def transit-r (transit/reader :json))
 
@@ -122,9 +123,10 @@
          blocks-with-page-id (fill-block-fields blocks*)]
      (<? (p->c (persist-db/<new repo)))
      (<? (p->c (persist-db/<transact-data repo blocks-with-page-id nil)))
+     (<? (p->c (persist-db/<release-access-handles repo)))
+     (state/add-repo! {:url repo})
      (op-mem-layer/update-local-tx! repo t))))
 
-
 (defn <download-graph
   [state repo graph-uuid]
   (go-try
diff --git a/src/main/frontend/db_worker.cljs b/src/main/frontend/db_worker.cljs
index 65eb4f6746..a8b6adb9bc 100644
--- a/src/main/frontend/db_worker.cljs
+++ b/src/main/frontend/db_worker.cljs
@@ -2,7 +2,6 @@
   "Worker used for browser DB implementation"
   (:require [promesa.core :as p]
             [datascript.storage :refer [IStorage]]
-            [cljs.cache :as cache]
             [clojure.edn :as edn]
             [datascript.core :as d]
             [logseq.db.sqlite.common-db :as sqlite-common-db]
@@ -11,7 +10,8 @@
             ["@logseq/sqlite-wasm" :default sqlite3InitModule]
             ["comlink" :as Comlink]
             [clojure.string :as string]
-            [cljs-bean.core :as bean]))
+            [cljs-bean.core :as bean]
+            [frontend.util :as util]))
 
 (defonce *sqlite (atom nil))
 (defonce *sqlite-conns (atom nil))
@@ -69,13 +69,17 @@
 
 (defn upsert-addr-content!
   "Upsert addr+data-seq"
-  [repo data]
+  [repo data delete-addrs]
   (let [^Object db (get-sqlite-conn repo)]
     (assert (some? db) "sqlite db not exists")
     (.transaction db (fn [tx]
                        (doseq [item data]
                          (.exec tx #js {:sql "INSERT INTO kvs (addr, content) values ($addr, $content) on conflict(addr) do update set content = $content"
-                                        :bind item}))))))
+                                        :bind item}))
+
+                       (doseq [addr delete-addrs]
+                         (.exec db #js {:sql "Delete from kvs where addr = ?"
+                                        :bind #js [addr]}))))))
 
 (defn restore-data-from-addr
   [repo addr]
@@ -88,27 +92,31 @@
       (edn/read-string content))))
 
 (defn new-sqlite-storage
-  [repo {:keys [threshold]
-         :or {threshold 4096}}]
-  (let [_cache (cache/lru-cache-factory {} :threshold threshold)]
-    (reify IStorage
-      (-store [_ addr+data-seq]
-        (let [data (map
-                    (fn [[addr data]]
-                      #js {:$addr addr
-                           :$content (pr-str data)})
-                    addr+data-seq)]
-          (upsert-addr-content! repo data)))
+  [repo _opts]
+  (reify IStorage
+    (-store [_ addr+data-seq delete-addrs]
+      (util/profile
+       (str "SQLite store addr+data count: " (count addr+data-seq))
+       (let [data (map
+                   (fn [[addr data]]
+                     #js {:$addr addr
+                          :$content (pr-str data)})
+                   addr+data-seq)]
+         (upsert-addr-content! repo data delete-addrs))))
 
-      (-restore [_ addr]
-        (restore-data-from-addr repo addr)))))
+    (-restore [_ addr]
+      (restore-data-from-addr repo addr))))
 
 (defn- close-db!
   [repo ^js db]
   (swap! *sqlite-conns dissoc repo)
   (swap! *datascript-conns dissoc repo)
-  (swap! *opfs-pools dissoc repo)
-  (when db (.close db)))
+
+  (when db (.close db))
+  (when-let [^js pool (get-opfs-pool repo)]
+    (.releaseAccessHandles pool))
+
+  (swap! *opfs-pools dissoc repo))
 
 (defn- close-other-dbs!
   [repo]
@@ -147,6 +155,9 @@
   [repo]
   (when-not (get-sqlite-conn repo)
     (p/let [^js pool (<get-opfs-pool repo)
+            capacity (.getCapacity pool)
+            _ (when (zero? capacity)   ; file handle already releases since pool will be initialized only once
+                (.acquireAccessHandles pool))
             db (new (.-OpfsSAHPoolDb pool) (get-repo-path repo))
             storage (new-sqlite-storage repo {})]
       (swap! *sqlite-conns assoc repo db)
@@ -221,10 +232,16 @@
   (transact
    [_this repo tx-data tx-meta]
    (when-let [conn (get-datascript-conn repo)]
-     (let [tx-data (edn/read-string tx-data)
-           tx-meta (edn/read-string tx-meta)]
-       (d/transact! conn tx-data tx-meta)
-       nil)))
+     (util/profile
+      "DB transact!"
+      (try
+        (let [tx-data (edn/read-string tx-data)
+              tx-meta (edn/read-string tx-meta)]
+          (d/transact! conn tx-data tx-meta)
+          nil)
+        (catch :default e
+          (prn :debug :error)
+          (js/console.error e))))))
 
   (getInitialData
    [_this repo]
@@ -240,6 +257,11 @@
            result (remove-vfs! pool)]
      nil))
 
+  (releaseAccessHandles
+   [_this repo]
+   (when-let [^js pool (get-opfs-pool repo)]
+     (.releaseAccessHandles pool)))
+
   (exportDB
    [_this repo]
    (<export-db-file repo))
diff --git a/src/main/frontend/handler.cljs b/src/main/frontend/handler.cljs
index c89bfa4f79..ec6bfa7906 100644
--- a/src/main/frontend/handler.cljs
+++ b/src/main/frontend/handler.cljs
@@ -49,8 +49,7 @@
             [cljs-bean.core :as bean]
             [frontend.handler.test :as test]
             [frontend.db.rtc.op-mem-layer :as op-mem-layer]
-            [frontend.persist-db.browser :as db-browser]
-            [frontend.persist-db :as persist-db]))
+            [frontend.persist-db.browser :as db-browser]))
 
 (defn- set-global-error-notification!
   []
diff --git a/src/main/frontend/handler/events.cljs b/src/main/frontend/handler/events.cljs
index df6e085866..9f8f2413cb 100644
--- a/src/main/frontend/handler/events.cljs
+++ b/src/main/frontend/handler/events.cljs
@@ -950,13 +950,23 @@
 (defmethod handle :editor/edit-block [[_ block pos id opts]]
   (editor-handler/edit-block! block pos id opts))
 
-(defmethod handle :db/multiple-tabs-opfs-failed [_]
-  ;; close current tab or window
-  (notification/show!
-   (let [word (if (util/electron?) "window" "tab")]
-     (util/format "Logseq doesn't support multiple %ss access to the same graph yet, please close this %s."
-                  word word))
-   :warning false))
+(rum/defc multi-tabs-dialog
+  []
+  (let [word (if (util/electron?) "window" "tab")]
+    [:div.flex.p-4.flex-col.gap-4.h-64
+     [:span.warning.text-lg
+      (util/format "Logseq doesn't support multiple %ss access to the same graph yet, please close this %s or switch to another graph."
+                   word word)]
+     [:div.text-lg
+      [:p "Switch to another repo: "]
+      (repo/repos-dropdown {:on-click (fn [e]
+                                        (util/stop e)
+                                        (state/set-state! :error/multiple-tabs-access-opfs? false)
+                                        (state/close-modal!))})]]))
+
+(defmethod handle :show/multiple-tabs-error-dialog [_]
+  (state/set-state! :error/multiple-tabs-access-opfs? true)
+  (state/set-modal! multi-tabs-dialog {:container-overflow-visible? true}))
 
 (defn run!
   []
diff --git a/src/main/frontend/handler/repo.cljs b/src/main/frontend/handler/repo.cljs
index 8544139dcb..742501987c 100644
--- a/src/main/frontend/handler/repo.cljs
+++ b/src/main/frontend/handler/repo.cljs
@@ -22,6 +22,7 @@
             [frontend.state :as state]
             [frontend.util :as util]
             [frontend.util.fs :as util-fs]
+            [frontend.util.text :as text-util]
             [frontend.persist-db :as persist-db]
             [promesa.core :as p]
             [shadow.resource :as rc]
@@ -345,12 +346,18 @@
         delete-db-f (fn []
                       (let [current-repo (state/get-current-repo)]
                         (db/remove-conn! url)
-                        (db-persist/delete-graph! url)
+                        (when db-based? (db-persist/delete-graph! url))
                         (search/remove-db! url)
                         (state/delete-repo! repo)
-                        (when (= current-repo url)
+                        (if (= current-repo url)
                           (when-let [graph (:url (first (state/get-repos)))]
-                            (state/pub-event! [:graph/switch graph {:persist? false}])))))]
+                            (notification/show! (str "Removed graph "
+                                                     (pr-str (text-util/get-graph-name-from-path url))
+                                                     ". Redirecting to graph "
+                                                     (pr-str (text-util/get-graph-name-from-path url)))
+                                                :success)
+                            (state/pub-event! [:graph/switch graph {:persist? false}]))
+                          (notification/show! (str "Removed graph " (pr-str (text-util/get-graph-name-from-path url))) :success))))]
     (when (or (config/local-file-based-graph? url)
               db-based?
               (config/demo-graph? url))
diff --git a/src/main/frontend/modules/outliner/pipeline.cljs b/src/main/frontend/modules/outliner/pipeline.cljs
index 16a40302eb..2ae1af9012 100644
--- a/src/main/frontend/modules/outliner/pipeline.cljs
+++ b/src/main/frontend/modules/outliner/pipeline.cljs
@@ -50,8 +50,8 @@
                   (state/set-edit-content! input content)
                   (when pos (cursor/move-cursor-to input pos)))))))))))
 
-(defn- delete-property-parent-block-if-empty!
-  [repo tx-report deleted-block-uuids]
+(defn- delete-property-parent-block-if-empty
+  [tx-report deleted-block-uuids]
   (let [empty-property-parents (->> (keep (fn [child-id]
                                             (let [e (d/entity (:db-before tx-report) [:block/uuid child-id])]
                                               (when (:created-from-property (:block/metadata (:block/parent e)))
@@ -60,23 +60,21 @@
                                                     parent-now))))) deleted-block-uuids)
                                     distinct)]
     (when (seq empty-property-parents)
-      (let [tx-data (->>
-                     (mapcat (fn [b]
-                               (let [{:keys [created-from-block created-from-property]} (:block/metadata b)
-                                     created-block (db/entity [:block/uuid created-from-block])
-                                     properties (assoc (:block/properties created-block) created-from-property "")]
-                                 (when (and created-block created-from-property)
-                                   [[:db/retractEntity (:db/id b)]
-                                    [:db/add (:db/id created-block) :block/properties properties]])))
-                             empty-property-parents)
-                     (remove nil?))]
-        (db/transact! repo tx-data {:outliner/transact? true
-                                    :replace? true})))))
+      (->>
+       (mapcat (fn [b]
+                 (let [{:keys [created-from-block created-from-property]} (:block/metadata b)
+                       created-block (db/entity [:block/uuid created-from-block])
+                       properties (assoc (:block/properties created-block) created-from-property "")]
+                   (when (and created-block created-from-property)
+                     [[:db/retractEntity (:db/id b)]
+                      [:db/add (:db/id created-block) :block/properties properties]])))
+               empty-property-parents)
+       (remove nil?)))))
 
 (defn invoke-hooks
   [tx-report]
   (let [tx-meta (:tx-meta tx-report)
-        {:keys [compute-path-refs? from-disk? new-graph? replace?]} tx-meta]
+        {:keys [from-disk? new-graph? pipeline-replace?]} tx-meta]
     (when (and (not from-disk?)
                (not new-graph?))
       (try
@@ -87,51 +85,46 @@
 
       (let [{:keys [pages blocks]} (ds-report/get-blocks-and-pages tx-report)
             repo (state/get-current-repo)
-            tx (when-not compute-path-refs?
-                 (util/profile
-                  "Compute path refs: "
-                  (set (compute-block-path-refs-tx tx-report blocks))))
-            tx-report' (if (seq tx)
-                         (let [refs-tx-data' (:tx-data (db/transact! repo tx {:outliner/transact? true
-                                                                              :replace? true
-                                                                              :compute-path-refs? true}))]
-                           ;; merge
-                           (assoc tx-report :tx-data (concat (:tx-data tx-report) refs-tx-data')))
-                         tx-report)
             importing? (:graph/importing @state/state)
-            deleted-block-uuids (set (outliner-pipeline/filter-deleted-blocks (:tx-data tx-report)))]
+            deleted-block-uuids (set (outliner-pipeline/filter-deleted-blocks (:tx-data tx-report)))
+            replace-full-tx (when-not pipeline-replace?
+                              (concat
+                                 ;; block path refs
+                               (util/profile
+                                "Compute path refs: "
+                                (set (compute-block-path-refs-tx tx-report blocks)))
 
-        (when (and (seq deleted-block-uuids) (not replace?)
-                   (not compute-path-refs?))
-          (delete-property-parent-block-if-empty! repo tx-report deleted-block-uuids))
+                                 ;; delete empty property parent block
+                               (when (seq deleted-block-uuids)
+                                 (delete-property-parent-block-if-empty tx-report deleted-block-uuids))
 
-        (let [updated-blocks (remove (fn [b] (contains? (set deleted-block-uuids)  (:block/uuid b))) blocks)
-              tx-id (get-in tx-report' [:tempids :db/current-tx])
-              update-tx-ids (->>
-                             (map (fn [b]
-                                    (when-let [db-id (:db/id b)]
-                                      {:db/id db-id
-                                       :block/tx-id tx-id})) updated-blocks)
-                             (remove nil?))]
-          (when (and (seq update-tx-ids)
-                     (not (:update-tx-ids? tx-meta)))
-            (db/transact! repo update-tx-ids {:replace? true
-                                              :update-tx-ids? true}))
-          (when (and (config/db-based-graph? repo) (not config/publishing?))
-            (persist-db/<transact-data repo (:tx-data tx-report) (:tx-meta tx-report))))
+                                 ;; update block/tx-id
+                               (let [updated-blocks (remove (fn [b] (contains? (set deleted-block-uuids)  (:block/uuid b))) blocks)
+                                     tx-id (get-in tx-report [:tempids :db/current-tx])]
+                                 (->>
+                                  (map (fn [b]
+                                         (when-let [db-id (:db/id b)]
+                                           {:db/id db-id
+                                            :block/tx-id tx-id})) updated-blocks)
+                                  (remove nil?)))))]
 
-        (when-not importing?
-          (react/refresh! repo tx-report'))
+        (when (and (not config/publishing?) (not pipeline-replace?))
+          (let [tx-report' (db/transact! repo replace-full-tx {:replace? true
+                                                               :pipeline-replace? true})
+                full-tx-data (concat (:tx-data tx-report) (:tx-data tx-report'))]
+            (persist-db/<transact-data repo full-tx-data (:tx-meta tx-report))
+            (when-not importing?
+              (react/refresh! repo (assoc tx-report :tx-data full-tx-data)))))
 
         (when (and (not (:delete-files? tx-meta))
-                   (not replace?))
+                   (not pipeline-replace?))
           (doseq [p (seq pages)]
             (updated-page-hook tx-report p)))
 
         (when (and state/lsp-enabled?
                    (seq blocks)
                    (not importing?)
-                   (not replace?)
+                   (not pipeline-replace?)
                    (<= (count blocks) 1000))
           (state/pub-event! [:plugin/hook-db-tx
                              {:blocks  blocks
diff --git a/src/main/frontend/persist_db.cljs b/src/main/frontend/persist_db.cljs
index 137118fca7..0ee27e4e40 100644
--- a/src/main/frontend/persist_db.cljs
+++ b/src/main/frontend/persist_db.cljs
@@ -2,10 +2,7 @@
    "Backend of DB based graph"
    (:require [frontend.persist-db.browser :as browser]
              [frontend.persist-db.protocol :as protocol]
-             [promesa.core :as p]
-             [frontend.config :as config]
-             [frontend.state :as state]
-             [frontend.util :as util]))
+             [promesa.core :as p]))
 
 (defonce opfs-db (browser/->InBrowser))
 
@@ -43,4 +40,21 @@
 ;; @shuyu Do we still need this?
 (defn <new [repo]
   {:pre [(<= (count repo) 56)]}
-  (protocol/<new (get-impl) repo))
+  (p/let [_ (protocol/<new (get-impl) repo)]
+    (<export-db repo {})))
+
+(defn <release-access-handles
+  [repo]
+  (protocol/<release-access-handles (get-impl) repo))
+
+(comment
+  (defn run-export-periodically!
+    []
+    (js/setInterval
+     (fn []
+       (when-let [repo (state/get-current-repo)]
+         (when (and (util/electron?) (config/db-based-graph? repo))
+           (println :debug :save-db-to-disk repo)
+           (<export-db repo {}))))
+   ;; every 10 minutes
+     (* 10 60 1000))))
diff --git a/src/main/frontend/persist_db/browser.cljs b/src/main/frontend/persist_db/browser.cljs
index 1bce35990f..fb010e586f 100644
--- a/src/main/frontend/persist_db/browser.cljs
+++ b/src/main/frontend/persist_db/browser.cljs
@@ -40,15 +40,21 @@
 (defn <export-db!
   [repo data]
   (cond
-    (and (util/electron?) (config/db-based-graph? repo))
+    (util/electron?)
     (ipc/ipc :db-export repo data)
 
     ;; TODO: browser nfs-supported? auto backup
-
+    
     ;;
     :else
     nil))
 
+(defn- sqlite-error-handler
+  [error]
+  (if (= "NoModificationAllowedError"  (.-name error))
+    (state/pub-event! [:show/multiple-tabs-error-dialog])
+    (notification/show! [:div (str "SQLiteDB error: " error)] :error)))
+
 (defrecord InBrowser []
   protocol/PersistentDB
   (<new [_this repo]
@@ -61,17 +67,16 @@
       (-> (.listDB sqlite)
           (p/then (fn [result]
                     (bean/->clj result)))
-          (p/catch (fn [error]
-                     (prn :debug :list-db-error (js/Date.))
-                     (if (= "NoModificationAllowedError"  (.-name error))
-                       (state/pub-event! [:db/multiple-tabs-opfs-failed])
-                       (notification/show! [:div (str "SQLiteDB error: " error)] :error))
-                     [])))))
+          (p/catch sqlite-error-handler))))
 
   (<unsafe-delete [_this repo]
     (when-let [^js sqlite @*sqlite]
       (.unsafeUnlinkDB sqlite repo)))
 
+  (<release-access-handles [_this repo]
+    (when-let [^js sqlite @*sqlite]
+      (.releaseAccessHandles sqlite repo)))
+
   (<transact-data [_this repo tx-data tx-meta]
     (let [^js sqlite @*sqlite
           tx-data' (pr-str tx-data)
@@ -92,10 +97,7 @@
       (-> (p/let [_ (.createOrOpenDB sqlite repo)
                   _ (ipc/ipc :db-open repo)]
             (.getInitialData sqlite repo))
-          (p/catch (fn [error]
-                     (prn :debug :fetch-initial-data-error repo)
-                     (js/console.error error)
-                     (notification/show! [:div (str "SQLiteDB fetch error: " error)] :error) {})))))
+          (p/catch sqlite-error-handler))))
 
   (<export-db [_this repo opts]
     (when-let [^js sqlite @*sqlite]
diff --git a/src/main/frontend/persist_db/protocol.cljs b/src/main/frontend/persist_db/protocol.cljs
index 144ec39ed3..d1f8af904e 100644
--- a/src/main/frontend/persist_db/protocol.cljs
+++ b/src/main/frontend/persist_db/protocol.cljs
@@ -5,6 +5,7 @@
   (<list-db [this] "List all databases")
   (<new [this repo] "Create or open a graph")
   (<unsafe-delete [this repo] "Delete graph and its vfs")
+  (<release-access-handles [this repo] "Release access file handles")
   (<transact-data [this repo tx-data tx-meta] "Transact data to db")
   (<fetch-initial-data [this repo opts] "Fetch Initial data")
   (<export-db [this repo opts] "Save or get SQLite db")
diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs
index 8445e10246..feba7ad41f 100644
--- a/src/main/frontend/state.cljs
+++ b/src/main/frontend/state.cljs
@@ -1532,7 +1532,7 @@ Similar to re-frame subscriptions"
 
 (defn close-modal!
   []
-  (when-not (editing?)
+  (when-not (or (editing?) (:error/multiple-tabs-access-opfs? @state))
     (close-dropdowns!)
     (if (seq (get-sub-modals))
       (close-sub-modal!)
diff --git a/yarn.lock b/yarn.lock
index 8396445f2f..2f2d7915d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -552,10 +552,10 @@
   resolved "https://registry.yarnpkg.com/@logseq/react-tweet-embed/-/react-tweet-embed-1.3.1-1.tgz#119d22be8234de006fc35c3fa2a36f85634c5be6"
   integrity sha512-9O0oHs5depCvh6ZQvwtl1xb7B80YG5rUfY10uSUat5itOlcE3IWaYYpe6p/tcHErqHWnWgkXHitAB9M29FMbQg==
 
-"@logseq/sqlite-wasm@=0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@logseq/sqlite-wasm/-/sqlite-wasm-0.0.7.tgz#c887e2e39dcf2b08b1fa4b2730bf4a9c3d8ae0ac"
-  integrity sha512-8bbAx4FW5p8JNNPjjwAMW9ZGfI8OzEmamBD6ZMupmVzHjYdHXvwG52Upinkd28p2pzmw5tpMBip9/3zVKgH6Pg==
+"@logseq/sqlite-wasm@=0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@logseq/sqlite-wasm/-/sqlite-wasm-0.1.0.tgz#b866d22d7a83bfa6815fe7f4d8899097b49af642"
+  integrity sha512-Ft/ZY8b2s35pFS7L7NX0CKWa5WkeKueYB7l5AYFFvQ2QQ0s7O4zlEi+jIX/ZdO2vnf2p4ALg+QvgaPgu6w2o5w==
 
 "@mapbox/node-pre-gyp@^1.0.0":
   version "1.0.11"