diff --git a/src/settings/controllers/InvisibleCryptoController.ts b/src/settings/controllers/InvisibleCryptoController.ts
index f000e4a8b2..642c2e9d81 100644
--- a/src/settings/controllers/InvisibleCryptoController.ts
+++ b/src/settings/controllers/InvisibleCryptoController.ts
@@ -12,8 +12,9 @@ import { SettingLevel } from "../SettingLevel";
 
 export default class InvisibleCryptoController extends SettingController {
     public onChange(level: SettingLevel, roomId: string, newValue: any): void {
-        MatrixClientPeg.safeGet()
-            .getCrypto()!
-            .setCryptoMode(newValue ? CryptoMode.Invisible : CryptoMode.Legacy);
+        const crypto = MatrixClientPeg.safeGet().getCrypto();
+        if (crypto) {
+            crypto.setCryptoMode(newValue ? CryptoMode.Invisible : CryptoMode.Legacy);
+        }
     }
 }