diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/Components/App.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/Components/App.razor
index 80f49350dc..ebe25c0f24 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/Components/App.razor
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/Components/App.razor
@@ -12,6 +12,7 @@
     <link href="global.css?_v=638424860497814240" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
+    <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
 
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
     <link href="manifest.json" rel="manifest" />
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Components/App.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Components/App.razor
index 80f49350dc..ebe25c0f24 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Components/App.razor
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Components/App.razor
@@ -12,6 +12,7 @@
     <link href="global.css?_v=638424860497814240" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
+    <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
 
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
     <link href="manifest.json" rel="manifest" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs
index 14613c77a7..035c9ef835 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs
@@ -67,7 +67,6 @@ public class MyProjectNameBlazorClientModule : AbpModule
 
     private static void ConfigureAuthentication(WebAssemblyHostBuilder builder)
     {
-        builder.Services.AddCascadingAuthenticationState();
         builder.Services.AddOidcAuthentication(options =>
         {
             builder.Configuration.Bind("AuthServer", options.ProviderOptions);
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBlazorModule.cs
index 842da9f919..d309a35291 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBlazorModule.cs
@@ -7,7 +7,6 @@ using Medallion.Threading.Redis;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -173,7 +172,6 @@ public class MyProjectNameBlazorModule : AbpModule
 
     private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
     {
-        context.Services.TryAddScoped<ProtectedLocalStorage>();
         context.Services.AddAuthentication(options =>
             {
                 options.DefaultScheme = "Cookies";
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj
index b5e10dd4bd..be82d8919f 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj
@@ -70,9 +70,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="Components\Pages\_ViewImports.cshtml" />
-    <_ContentIncludedByDefault Remove="Components\Pages\Index.razor" />
-  </ItemGroup>
-
 </Project>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
index 3121bb1188..871de813c1 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
@@ -11,6 +11,7 @@
     <link href="global.css?_v=638417120185267609" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
+    <link href="MyCompanyName.MyProjectName.Blazor.Client.styles.css" rel="stylesheet"/>
 
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
     <link href="manifest.json" rel="manifest" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs
index 3d4d3c1afc..9fae4422f1 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs
@@ -8,6 +8,7 @@ using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp;
 
 var builder = WebApplication.CreateBuilder(args);
 
+//https://github.com/dotnet/aspnetcore/issues/52530
 builder.Services.Configure<RouteOptions>(options =>
 {
     options.SuppressCheckForUnhandledSecurityMetadata = true;
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/App.razor b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/App.razor
index e381fc5b1e..4ecc6e911f 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/App.razor
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/App.razor
@@ -7,10 +7,11 @@
     <title>MyCompanyName.MyProjectName.Blazor</title>
     <base href="/" />
 
-    <!--ABP:Styles-->
-    <link href="global.css?_v=638424689870700471" rel="stylesheet"/>
-    <link href="main.css" rel="stylesheet"/>
+    <!--ABP:Styles-->
+    <link href="global.css?_v=638424689870700471" rel="stylesheet"/>
+    <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
+    <link href="MyCompanyName.MyProjectName.Blazor.Host.Client.styles.css" rel="stylesheet"/>
 
     <HeadOutlet @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
 </head>
@@ -28,8 +29,8 @@
         <Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)"/>
     </div>
 
-    <!--ABP:Scripts-->
-    <script src="global.js?_v=638424689871310405"></script>
+    <!--ABP:Scripts-->
+    <script src="global.js?_v=638424689871310405"></script>
     <!--/ABP:Scripts-->
 
 </body>
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs
index 250decf991..8e165a87fe 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs
@@ -273,7 +273,6 @@ public class MyProjectNameBlazorHostModule : AbpModule
                 .AddInteractiveServerRenderMode()
                 .AddAdditionalAssemblies(builder.ServiceProvider.GetRequiredService<IOptions<AbpRouterOptions>>().Value.AdditionalAssemblies.ToArray());
         });
-        app.UseConfiguredEndpoints();
 
         using (var scope = context.ServiceProvider.CreateScope())
         {