diff --git a/umbraco/presentation/template.cs b/umbraco/presentation/template.cs
index 0c29825669..67155a888f 100644
--- a/umbraco/presentation/template.cs
+++ b/umbraco/presentation/template.cs
@@ -532,7 +532,9 @@ namespace umbraco
                     }
                 }
             }
-            checkForMaster(templateID);
+            // Only check for master on legacy templates - can show error when using master pages.
+            if(!UmbracoSettings.UseAspNetMasterPages)
+                checkForMaster(templateID);
         }
 
         private void checkForMaster(int templateID) {