diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml
index 7cf5ea808e5a..e0d7b2fae27e 100644
--- a/.azure/pipelines/ci-public.yml
+++ b/.azure/pipelines/ci-public.yml
@@ -636,6 +636,8 @@ stages:
         agentOs: Windows
         isAzDOTestingJob: true
         timeoutInMinutes: 240
+        # Temporarily disabled due to https://github.com/dotnet/aspnetcore/issues/63140
+        condition: 'false'
         steps:
         - script: git submodule update --init
           displayName: Update submodules
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs
index be71c6ad04dd..1b8771773c04 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs
@@ -107,6 +107,7 @@ public static void Main(string[] args)
         #endif
         }
 
+        app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
         #if (HasHttpsProfile)
         app.UseHttpsRedirection();
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs
index c325a1f788a6..ae3fb9dcfce7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs
@@ -100,7 +100,7 @@
     app.UseHsts();
 #endif
 }
-
+app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
 #if (HasHttpsProfile)
 app.UseHttpsRedirection();