diff --git a/src/utils/createMatrixClient.js b/src/utils/createMatrixClient.js
index 2acd1fae28..040f1e96cb 100644
--- a/src/utils/createMatrixClient.js
+++ b/src/utils/createMatrixClient.js
@@ -48,10 +48,6 @@ export default function createMatrixClient(opts, useIndexedDb) {
         useAuthorizationHeader: true,
     };
 
-    if (localStorage) {
-        storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage);
-    }
-
     if (indexedDB && localStorage && useIndexedDb) {
         storeOpts.store = new Matrix.IndexedDBStore({
             indexedDB: indexedDB,
@@ -61,6 +57,16 @@ export default function createMatrixClient(opts, useIndexedDb) {
         });
     }
 
+    if (localStorage) {
+        storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage);
+    }
+
+    if (indexedDB && useIndexedDb) {
+        storeOpts.cryptoStore = new Matrix.IndexedDBCryptoStore(
+            indexedDB, "matrix-js-sdk:crypto",
+        );
+    }
+
     opts = Object.assign(storeOpts, opts);
 
     return Matrix.createClient(opts);