diff --git a/src/electron-main.js b/src/electron-main.js
index 36c7aa9..9c10faf 100644
--- a/src/electron-main.js
+++ b/src/electron-main.js
@@ -393,6 +393,14 @@ ipcMain.on('seshat', async function(ev, payload) {
             break;
 
         case 'closeEventIndex':
+            if (eventIndex !== null) {
+                try {
+                    await eventIndex.shutdown();
+                } catch (e) {
+                    sendError(payload.id, e);
+                    return;
+                }
+            }
             eventIndex = null;
             break;