diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml
similarity index 94%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml
index cd87ea9518..6436437154 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml
@@ -1,16 +1,16 @@
-@page "/error"
-
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>
\ No newline at end of file
+@page
+
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
+    It can result in displaying sensitive information from exceptions to end users.
+    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
+    and restarting the app.
+</p>
diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json
index 9152fc62d0..3c9cef897b 100644
--- a/src/ProjectTemplates/test/template-baselines.json
+++ b/src/ProjectTemplates/test/template-baselines.json
@@ -914,7 +914,7 @@
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "Pages/Counter.razor",
-        "Pages/Error.razor",
+        "Pages/Error.cshtml",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -951,7 +951,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
-        "Pages/Error.razor",
+        "Pages/Error.cshtml",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -988,7 +988,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
-        "Pages/Error.razor",
+        "Pages/Error.cshtml",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -1024,7 +1024,7 @@
         "_Imports.razor",
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
-        "Pages/Error.razor",
+        "Pages/Error.cshtml",
         "Pages/Counter.razor",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
@@ -1061,7 +1061,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
-        "Pages/Error.razor",
+        "Pages/Error.cshtml",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -1098,7 +1098,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
-        "Pages/Error.razor",
+        "Pages/Error.cshtml",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",