diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java
index 396d7b76c..85c1388b6 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java
@@ -86,11 +86,7 @@ public class ResponseHandler extends TreePageHandler {
         registerPage("network", serverPageHandler);
         registerPage("server", serverPageHandler);
 
-        if (webServer.get().isAuthRequired()) {
-            registerPage("", new RootPageHandler(responseFactory, serverInfo));
-        } else {
-            registerPage("", responseFactory.redirectResponse(serverInfo.getServer().isProxy() ? "/network" : "/server"), 5);
-        }
+        registerPage("", new RootPageHandler(responseFactory, webServer.get(), serverInfo));
 
         registerPage("v1", rootJSONHandler);
     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/pages/RootPageHandler.java b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/pages/RootPageHandler.java
index bd6e76789..5c5c5f564 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/pages/RootPageHandler.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/pages/RootPageHandler.java
@@ -21,6 +21,7 @@ import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.system.info.server.ServerInfo;
 import com.djrapitops.plan.system.webserver.Request;
 import com.djrapitops.plan.system.webserver.RequestTarget;
+import com.djrapitops.plan.system.webserver.WebServer;
 import com.djrapitops.plan.system.webserver.auth.Authentication;
 import com.djrapitops.plan.system.webserver.response.RedirectResponse;
 import com.djrapitops.plan.system.webserver.response.Response;
@@ -38,15 +39,21 @@ import java.util.Optional;
 public class RootPageHandler implements PageHandler {
 
     private final ResponseFactory responseFactory;
+    private final WebServer webServer;
     private final ServerInfo serverInfo;
 
-    public RootPageHandler(ResponseFactory responseFactory, ServerInfo serverInfo) {
+    public RootPageHandler(ResponseFactory responseFactory, WebServer webServer, ServerInfo serverInfo) {
         this.responseFactory = responseFactory;
+        this.webServer = webServer;
         this.serverInfo = serverInfo;
     }
 
     @Override
     public Response getResponse(Request request, RequestTarget target) throws WebException {
+        if (!webServer.isAuthRequired()) {
+            return responseFactory.redirectResponse(serverInfo.getServer().isProxy() ? "/network" : "/server");
+        }
+
         Optional<Authentication> auth = request.getAuth();
         if (!auth.isPresent()) {
             return responseFactory.basicAuth();