diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 0ce6a9b768..6908b2b333 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -728,7 +728,7 @@ namespace Umbraco.Web.Routing
 
         private ITemplate GetTemplateModel(int? templateId)
         {
-            if (templateId.HasValue == false)
+            if (templateId.HasValue == false || templateId.Value == default)
             {
                 _logger.Debug<PublishedRouter>("GetTemplateModel: No template.");
                 return null;