diff --git a/lib/classes/TwoFactorAuth.php b/lib/classes/TwoFactorAuth.php
index 5373c9aa3f5634d545fb6f5c71292f3ecf281a7f..70d05676b27b35e062211fd1b45c3551372ddfc9 100644
--- a/lib/classes/TwoFactorAuth.php
+++ b/lib/classes/TwoFactorAuth.php
@@ -90,12 +90,15 @@ final class TwoFactorAuth
             return;
         }
 
-        $secret = TFASecret::find($user->id);
-        if (!$secret) {
+        if (!self::isEnabledForUser($user)) {
             return;
         }
 
-        $this->secret = $secret;
+        if (!TFASecret::exists($user->id)) {
+            return;
+        }
+
+        $this->secret = TFASecret::find($user->id);
     }
 
     /**