diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 218b7e4d4e..7eda69ad9b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1221,7 +1221,15 @@ export default createReactClass({
     /**
      * Called when the session is logged out
      */
-    _onLoggedOut: function() {
+    _onLoggedOut: async function() {
+        const platform = PlatformPeg.get();
+
+        if (platform.supportsEventIndexing()) {
+            console.log("Seshat: Deleting event index.");
+            this.crawlerRef.cancel();
+            await platform.deleteEventIndex();
+        }
+
         this.notifyNewScreen('login');
         this.setStateForNewView({
             view: VIEWS.LOGIN,