diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 17fddd98ea..b1efd782fa 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -36,9 +36,9 @@
             public const string AngularHeadername = "X-UMB-XSRF-TOKEN";
 
             /// <summary>
-            /// The route for rendering a page when no content is published.
+            /// The route name of the page shown when Umbraco has no published content.
             /// </summary>
-            public const string NoContentRoute = "/UmbNoContent";
+            public const string NoContentRouteName = "umbraco-no-content";
         }
     }
 }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index 933cababed..cca0495028 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -22,6 +22,7 @@ using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 
+using Constants = Umbraco.Core.Constants;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Runtime
@@ -196,8 +197,8 @@ namespace Umbraco.Web.Runtime
         private static void RouteNoContentController(string umbracoPath)
         {
             RouteTable.Routes.MapRoute(
-                "umbraco-no-content",
-                umbracoPath + Core.Constants.Web.NoContentRoute,
+                Constants.Web.NoContentRouteName,
+                umbracoPath + "/UmbNoContent",
                 new { controller = "RenderNoContent", action = "Index" });
         }
 
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index d3c72090db..3f92ca587e 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -241,8 +241,10 @@ namespace Umbraco.Web
 
             _logger.Warn<UmbracoModule>("Umbraco has no content");
 
-            var rewriteTo = _uriUtility.ToAbsolute(_globalSettings.UmbracoPath + Constants.Web.NoContentRoute);
-            httpContext.RewritePath(_uriUtility.ToAbsolute(rewriteTo));
+            if (RouteTable.Routes[Constants.Web.NoContentRouteName] is Route route)
+            {
+                httpContext.RewritePath(route.Url);
+            }
 
             return false;
         }