diff --git a/src/services/totp.ts b/src/services/totp.ts
index 66a0c7d60..cabeaae15 100644
--- a/src/services/totp.ts
+++ b/src/services/totp.ts
@@ -3,8 +3,8 @@ import options from './options.js';
 import totpEncryptionService from './encryption/totp_encryption.js';
 
 function isTotpEnabled(): boolean {
-    return options.getOption('mfaEnabled') === "true" &&
-        options.getOption('mfaMethod') === "totp" &&
+    return options.getOptionOrNull('mfaEnabled') === "true" &&
+        options.getOptionOrNull('mfaMethod') === "totp" &&
         totpEncryptionService.isTotpSecretSet();
 }