diff --git a/application/Espo/Services/UserSecurity.php b/application/Espo/Services/UserSecurity.php
index 3b4468b95d..6813ba2c5a 100644
--- a/application/Espo/Services/UserSecurity.php
+++ b/application/Espo/Services/UserSecurity.php
@@ -151,6 +151,12 @@ class UserSecurity extends \Espo\Core\Services\Base
             $userData->set('auth2FAMethod', null);
         }
 
+        if ($userData->get('auth2FA') && $userData->isAttributeChanged('auth2FA')) {
+            if (!$this->getInjection('config')->get('auth2FA')) {
+                throw new Forbidden('2FA is not enabled.');
+            }
+        }
+
         if (
             $userData->get('auth2FA') &&
             $userData->get('auth2FAMethod') &&