diff --git a/package.json b/package.json
index 45231fa..8cfb8c3 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "tar": "^6.0.1"
   },
   "hakDependencies": {
-    "matrix-seshat": "^2.0.0",
+    "matrix-seshat": "^2.1.0",
     "keytar": "^5.6.0"
   },
   "build": {
diff --git a/src/electron-main.js b/src/electron-main.js
index b68dfe5..00215cb 100644
--- a/src/electron-main.js
+++ b/src/electron-main.js
@@ -207,6 +207,14 @@ let eventIndex = null;
 let mainWindow = null;
 global.appQuitting = false;
 
+
+const deleteContents = async (p) => {
+    for (const entry of await afs.readdir(p)) {
+        const curPath = path.join(p, entry);
+        await afs.unlink(curPath);
+    }
+};
+
 // handle uncaught errors otherwise it displays
 // stack traces in popup dialogs, which is terrible (which
 // it will do any time the auto update poke fails, and there's
@@ -453,7 +461,22 @@ ipcMain.on('seshat', async function(ev, payload) {
                             const recoveryIndex = new SeshatRecovery(eventStorePath, {
                                 passphrase: seshatPassphrase,
                             });
-                            await recoveryIndex.reindex();
+
+                            const userVersion = await recoveryIndex.getUserVersion();
+
+                            // If our user version is 0 we'll delete the db
+                            // anyways so reindexing it is a waste of time.
+                            if (userVersion === 0) {
+                                await recoveryIndex.shutdown();
+
+                                try {
+                                    await deleteContents(eventStorePath);
+                                } catch (e) {
+                                }
+                            } else {
+                                await recoveryIndex.reindex();
+                            }
+
                             eventIndex = new Seshat(eventStorePath, {
                                 passphrase: seshatPassphrase,
                             });
@@ -485,15 +508,8 @@ ipcMain.on('seshat', async function(ev, payload) {
 
         case 'deleteEventIndex':
             {
-                const deleteFolderRecursive = async (p) => {
-                    for (const entry of await afs.readdir(p)) {
-                        const curPath = path.join(p, entry);
-                        await afs.unlink(curPath);
-                    }
-                };
-
                 try {
-                    await deleteFolderRecursive(eventStorePath);
+                    await deleteContents(eventStorePath);
                 } catch (e) {
                 }
             }