diff --git a/app/Http/Middleware/CheckConfigurationMiddleware.php b/app/Http/Middleware/CheckConfigurationMiddleware.php
index 33a921764..0d1e63caf 100644
--- a/app/Http/Middleware/CheckConfigurationMiddleware.php
+++ b/app/Http/Middleware/CheckConfigurationMiddleware.php
@@ -7,6 +7,7 @@ use Closure;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
 use PDO;
@@ -47,6 +48,12 @@ class CheckConfigurationMiddleware
             }
         }
 
+        // Redirect to login if we are in setup route
+        $route = $request->route();
+        if ($route instanceof Route && str_starts_with($route->getName(), 'setup.')) {
+            return redirect()->route('login');
+        }
+
         return $next($request);
     }
 }