diff --git a/classes/manager.php b/classes/manager.php
index 24d5810e..ac8ddc4d 100644
--- a/classes/manager.php
+++ b/classes/manager.php
@@ -614,7 +614,9 @@ public static function require_auth($courseorid = null, $autologinguest = null,
 
         if (!self::is_ready()) {
             // Set session var so if MFA becomes ready, you dont get locked from session.
-            $SESSION->tool_mfa_authenticated = true;
+            if (get_config('tool_mfa', 'enabled')) {
+                $SESSION->tool_mfa_authenticated = true;
+            }
             return;
         }