diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor
new file mode 100644
index 0000000000..cd87ea9518
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor
@@ -0,0 +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
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs
index f6d8f25248..f5a91824f6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs
@@ -144,7 +144,7 @@ namespace BlazorServerWeb_CSharp
             }
             else
             {
-                app.UseExceptionHandler("/Home/Error");
+                app.UseExceptionHandler("/Error");
 #if (RequiresHttps)
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
                 app.UseHsts();
diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json
index 39a8c5ddd8..22ebb25882 100644
--- a/src/ProjectTemplates/test/template-baselines.json
+++ b/src/ProjectTemplates/test/template-baselines.json
@@ -902,6 +902,7 @@
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "Pages/Counter.razor",
+        "Pages/Error.razor",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -938,6 +939,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
+        "Pages/Error.razor",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -974,6 +976,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
+        "Pages/Error.razor",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -1009,6 +1012,7 @@
         "_Imports.razor",
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
+        "Pages/Error.razor",
         "Pages/Counter.razor",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
@@ -1045,6 +1049,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
+        "Pages/Error.razor",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",
@@ -1081,6 +1086,7 @@
         "Data/WeatherForecast.cs",
         "Data/WeatherForecastService.cs",
         "Pages/Counter.razor",
+        "Pages/Error.razor",
         "Pages/FetchData.razor",
         "Pages/Index.razor",
         "Pages/_Host.cshtml",