diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index d1bdf7ead..6f589de9f 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -129,8 +129,6 @@ class RegisterController extends Controller
             'password' => ['required', 'confirmed', Password::min(8)->letters()->mixedCase()->numbers()->symbols()->uncompromised()],
         ]);
 
-        if (config('captcha.enabled') === true && (! empty(config('captcha.secret')) && ! empty(config('captcha.sitekey')))) {
-        }
 
         if ($validator->fails()) {
             $error = implode('', Arr::collapse($validator->errors()->toArray()));
diff --git a/app/Http/Requests/Auth/LoginLoginRequest.php b/app/Http/Requests/Auth/LoginLoginRequest.php
index 802b52117..6854f9b69 100644
--- a/app/Http/Requests/Auth/LoginLoginRequest.php
+++ b/app/Http/Requests/Auth/LoginLoginRequest.php
@@ -18,6 +18,8 @@ class LoginLoginRequest extends FormRequest
                     'captcha',
                 ],
             ];
+        } else {
+            return [];
         }
     }
 }
diff --git a/app/Http/Requests/Auth/RegisterRegisterRequest.php b/app/Http/Requests/Auth/RegisterRegisterRequest.php
index 9f308854a..a95a8d804 100644
--- a/app/Http/Requests/Auth/RegisterRegisterRequest.php
+++ b/app/Http/Requests/Auth/RegisterRegisterRequest.php
@@ -11,11 +11,16 @@ class RegisterRegisterRequest extends FormRequest
      */
     public function rules(): array
     {
-        return [
-            'g-recaptcha-response' => [
-                'required',
-                'captcha',
-            ],
-        ];
+        if (config('captcha.enabled') === true && (! empty(config('captcha.secret')) && ! empty(config('captcha.sitekey')))) {
+            return [
+                'g-recaptcha-response' => [
+                    'required',
+                    'captcha',
+                ],
+            ];
+        } else {
+            return [];
+        }
+
     }
 }