diff --git a/app/Http/Middleware/EnsureUserIsAdmin.php b/app/Http/Middleware/EnsureUserIsAdmin.php
index c9474b43..4dcd5225 100644
--- a/app/Http/Middleware/EnsureUserIsAdmin.php
+++ b/app/Http/Middleware/EnsureUserIsAdmin.php
@@ -19,10 +19,14 @@ class EnsureUserIsAdmin
      */
     public function handle(Request $request, Closure $next)
     {
-        $user = JWTAuth::parseToken()->authenticate();
-        if(!in_array($user->type, RoleTypes::ADMIN_ROLES)){
-            return response()->view('errors.503', [], 503);
+        $maintenanceTitle = env('MAINTENANCE_MESSAGE_TITLE', null);
+        if (!empty($maintenanceTitle)) {
+            $user = JWTAuth::parseToken()->authenticate();
+            if(!in_array($user->type, RoleTypes::ADMIN_ROLES)){
+                return response()->view('errors.503', [], 503);
+            }
         }
+
         return $next($request);
     }
 }