diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index bad4aa0c60..e481f134ec 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -244,6 +244,9 @@
     <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
     <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
     <Compile Include="IApplicationEventHandler.cs" />
+    <Compile Include="umbraco.presentation\Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\LibraryCacheRefresher.cs" />
     <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
     <Compile Include="XmlPublishedContentStore.cs" />
@@ -354,13 +357,6 @@
     <Compile Include="umbraco.presentation\content.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\default.aspx.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\default.aspx.designer.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\helper.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -1867,7 +1863,6 @@
     <Content Include="umbraco.presentation\umbraco\controls\Images\UploadMediaImage.ascx" />
     <Content Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx" />
     <Content Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx" />
-    <Content Include="umbraco.presentation\default.aspx" />
     <Content Include="umbraco.presentation\install\default.aspx" />
     <Content Include="umbraco.presentation\install\steps\license.ascx" />
     <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index aa0dbd3c1b..f547f5813a 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -116,6 +116,15 @@ namespace Umbraco.Web
 				}
 				else
 				{
+					if (!docreq.HasTemplate)
+					{
+						//TODO: If there is no template then we should figure out what to render, in v4 it is just a blank page but some think
+						// that it should be a 404. IMO I think it should just be a blank page because it is still a content item in the
+						//umbraco system, perhaps this should be put on the mail list? For now we will just make it a blank page
+						httpContext.Response.Clear();
+						httpContext.Response.End();
+					}
+
 					//TODO: Detect MVC vs WebForms
 					
 					var isMvc = true;