diff --git a/src/Tgstation.Server.Host/Controllers/HomeController.cs b/src/Tgstation.Server.Host/Controllers/HomeController.cs
index 3b5a2b3d9a..2bf911a446 100644
--- a/src/Tgstation.Server.Host/Controllers/HomeController.cs
+++ b/src/Tgstation.Server.Host/Controllers/HomeController.cs
@@ -165,7 +165,12 @@ namespace Tgstation.Server.Host.Controllers
 				if (controlPanelConfiguration.Enable && !Request.Headers.TryGetValue(ApiHeaders.ApiVersionHeader, out _))
 				{
 					Logger.LogDebug("No API headers on request, redirecting to control panel...");
-					return Redirect(controlPanelConfiguration.PublicPath ?? ControlPanelController.ControlPanelRoute);
+
+					var controlPanelRoute = controlPanelConfiguration.PublicPath;
+					if (String.IsNullOrWhiteSpace(controlPanelRoute))
+						controlPanelRoute = ControlPanelController.ControlPanelRoute;
+
+					return Redirect(controlPanelRoute);
 				}
 
 				try