diff --git a/src/main/frontend/db_worker.cljs b/src/main/frontend/db_worker.cljs
index b7344ccfd..799e522b6 100644
--- a/src/main/frontend/db_worker.cljs
+++ b/src/main/frontend/db_worker.cljs
@@ -118,6 +118,7 @@
   [repo]
   (when-let [db (@*sqlite-conns repo)]
     (swap! *sqlite-conns dissoc repo)
+    (swap! *datascript-conns dissoc repo)
     (.close ^Object db)))
 
 (defn- create-or-open-db!
@@ -247,8 +248,9 @@
 
   (unsafeUnlinkDB
    [_this repo]
-   (p/let [_ (close-db! repo)]
-     (remove-vfs! repo)
+   (p/let [_ (close-db! repo)
+           _ (remove-vfs! repo)]
+     (swap! *opfs-pools dissoc repo)
      nil))
 
   (exportDB
diff --git a/src/main/frontend/persist_db/browser.cljs b/src/main/frontend/persist_db/browser.cljs
index 267493df3..2b64dd65c 100644
--- a/src/main/frontend/persist_db/browser.cljs
+++ b/src/main/frontend/persist_db/browser.cljs
@@ -76,7 +76,7 @@
                      [])))))
 
   (<unsafe-delete [_this repo]
-    (p/let [^js sqlite @*sqlite]
+    (when-let [^js sqlite @*sqlite]
       (.unsafeUnlinkDB sqlite repo)))
 
   (<transact-data [_this repo tx-data tx-meta]