diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs
index 5b9eff853310..5e1fdbbbc433 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs
@@ -86,6 +86,29 @@ object RefreshAuthentication() =>
                 """);
     }
 
+    [Fact]
+    public void UpdatesAuthenticationStateWhenAuthenticationRefreshesAutomatically()
+    {
+        SignInAs("user-a", "TestRole", includeNameIdentifier: true);
+        var appElement = MountAndNavigateToAuthTest(
+            AuthorizeViewCases,
+            "?captureAuthenticationRefresh&accelerateAuthenticationRefresh");
+        Browser.Equal("Welcome, user-a!", () =>
+            appElement.FindElement(By.CssSelector("#authorize-role .authorized")).Text);
+
+        var javascript = (IJavaScriptExecutor)Browser;
+        var connectionId = Assert.IsType<string>(
+            javascript.ExecuteScript("return authenticationRefreshConnection.connectionId;"));
+
+        SignInAs(null, null, useSeparateTab: true);
+
+        Browser.Equal("You're not authorized, anonymous", () =>
+            appElement.FindElement(By.CssSelector("#authorize-role .not-authorized")).Text);
+        Assert.Equal(
+            connectionId,
+            Assert.IsType<string>(javascript.ExecuteScript("return authenticationRefreshConnection.connectionId;")));
+    }
+
     private void SignInAs(
         string userName,
         string roles,
diff --git a/src/Components/test/testassets/Components.TestServer/AuthenticationStartup.cs b/src/Components/test/testassets/Components.TestServer/AuthenticationStartup.cs
index f92842b82d1b..f56b1f6d8070 100644
--- a/src/Components/test/testassets/Components.TestServer/AuthenticationStartup.cs
+++ b/src/Components/test/testassets/Components.TestServer/AuthenticationStartup.cs
@@ -61,7 +61,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 endpoints.MapControllers();
                 endpoints.MapRazorPages();
-                endpoints.MapBlazorHub()
+                endpoints.MapBlazorHub(options =>
+                {
+                    options.MaximumAuthenticationExpiration = TimeSpan.FromMinutes(40);
+                    options.CloseOnAuthenticationExpiration = true;
+                })
                     .AddEndpointFilter(async (context, next) =>
                     {
                         if (context.HttpContext.WebSockets.IsWebSocketRequest)
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml
index 6de9575c0f98..794e6d72d66e 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml
@@ -53,9 +53,19 @@
 
     <script src="_framework/blazor.server.js" autostart="false"></script>
     <script>
+        const query = new URLSearchParams(location.search);
+        if (query.has('accelerateAuthenticationRefresh')) {
+            const setTimeout = window.setTimeout;
+            window.setTimeout = (handler, timeout, ...args) =>
+                setTimeout(
+                    handler,
+                    timeout >= 34 * 60 * 1000 && timeout <= 35 * 60 * 1000 ? 1000 : timeout,
+                    ...args);
+        }
+
         Blazor.start({
             configureSignalR: builder => {
-                if (new URLSearchParams(location.search).has('captureAuthenticationRefresh')) {
+                if (query.has('captureAuthenticationRefresh')) {
                     const build = builder.build.bind(builder);
                     builder.build = () => {
                         const connection = build();
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index 5fe01b0aa830..568887474099 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -152,12 +152,6 @@
             "BlazorWebCSharp.1/Components/Pages/Auth.razor"
           ]
         },
-        {
-          "condition": "(!(IndividualLocalAuth && UseServer))",
-          "exclude": [
-            "BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
-          ]
-        },
         {
           "condition": "(IndividualLocalAuth && UseLocalDB && UseWebAssembly)",
           "rename": {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index 3704516da2eb..897e2bef7dd5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -15,6 +16,28 @@ namespace Microsoft.AspNetCore.Routing;
 
 internal static class IdentityComponentsEndpointRouteBuilderExtensions
 {
+    // SignalR refreshes five minutes before this expiration, after Identity's default 30-minute
+    // security stamp validation interval has elapsed. Update this value if that interval is customized.
+    private static readonly TimeSpan s_maximumAuthenticationExpiration = TimeSpan.FromMinutes(40);
+
+    public static void ConfigureIdentityAuthenticationRefresh(this ServerComponentsEndpointOptions options)
+    {
+        ArgumentNullException.ThrowIfNull(options);
+
+        var configureConnection = options.ConfigureConnection;
+        options.ConfigureConnection = connectionOptions =>
+        {
+            configureConnection?.Invoke(connectionOptions);
+
+            if (connectionOptions.MaximumAuthenticationExpiration is not { } maximumExpiration ||
+                maximumExpiration > s_maximumAuthenticationExpiration)
+            {
+                connectionOptions.MaximumAuthenticationExpiration = s_maximumAuthenticationExpiration;
+            }
+            connectionOptions.CloseOnAuthenticationExpiration = true;
+        };
+    }
+
     // These endpoints are required by the Identity Razor components defined in the /Components/Account/Pages directory of this project.
     public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEndpointRouteBuilder endpoints)
     {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
deleted file mode 100644
index 489443fbeffb..000000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Server;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-using BlazorWebCSharp._1.Data;
-
-namespace BlazorWebCSharp._1.Components.Account;
-
-// This is a server-side AuthenticationStateProvider that revalidates the security stamp for the connected user
-// every 30 minutes an interactive circuit is connected.
-internal sealed class IdentityRevalidatingAuthenticationStateProvider(
-        ILoggerFactory loggerFactory,
-        IServiceScopeFactory scopeFactory,
-        IOptions<IdentityOptions> options)
-    : RevalidatingServerAuthenticationStateProvider(loggerFactory)
-{
-    protected override TimeSpan RevalidationInterval => TimeSpan.FromMinutes(30);
-
-    protected override async Task<bool> ValidateAuthenticationStateAsync(
-        AuthenticationState authenticationState, CancellationToken cancellationToken)
-    {
-        // Get the user manager from a new scope to ensure it fetches fresh data
-        await using var scope = scopeFactory.CreateAsyncScope();
-        var userManager = scope.ServiceProvider.GetRequiredService<UserManager<ApplicationUser>>();
-        return await ValidateSecurityStampAsync(userManager, authenticationState.User);
-    }
-
-    private async Task<bool> ValidateSecurityStampAsync(UserManager<ApplicationUser> userManager, ClaimsPrincipal principal)
-    {
-        var user = await userManager.GetUserAsync(principal);
-        if (user is null)
-        {
-            return false;
-        }
-        else if (!userManager.SupportsUserSecurityStamp)
-        {
-            return true;
-        }
-        else
-        {
-            var principalStamp = principal.FindFirstValue(options.Value.ClaimsIdentity.SecurityStampClaimType);
-            var userStamp = await userManager.GetSecurityStampAsync(user);
-            return principalStamp == userStamp;
-        }
-    }
-}
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 0dad1c053eae..9a487804b1bd 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
@@ -1,7 +1,4 @@
 #if (IndividualLocalAuth)
-#if (UseServer)
-using Microsoft.AspNetCore.Components.Authorization;
-#endif
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 #endif
@@ -47,9 +44,6 @@ public static void Main(string[] args)
         #if (IndividualLocalAuth)
         builder.Services.AddCascadingAuthenticationState();
         builder.Services.AddScoped<IdentityRedirectManager>();
-        #if (UseServer)
-        builder.Services.AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>();
-        #endif
 
         builder.Services.AddAuthentication(options =>
             {
@@ -110,11 +104,19 @@ public static void Main(string[] args)
         app.MapStaticAssets();
         #if (UseServer && UseWebAssembly)
         app.MapRazorComponents<App>()
+          #if (IndividualLocalAuth)
+            .AddInteractiveServerRenderMode(options => options.ConfigureIdentityAuthenticationRefresh())
+          #else
             .AddInteractiveServerRenderMode()
+          #endif
             .AddInteractiveWebAssemblyRenderMode()
         #elif (UseServer)
         app.MapRazorComponents<App>()
+          #if (IndividualLocalAuth)
+            .AddInteractiveServerRenderMode(options => options.ConfigureIdentityAuthenticationRefresh());
+          #else
             .AddInteractiveServerRenderMode();
+          #endif
         #elif (UseWebAssembly)
         app.MapRazorComponents<App>()
             .AddInteractiveWebAssemblyRenderMode()
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 41364566d3cb..d9447e6a844d 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
@@ -1,7 +1,4 @@
 #if (IndividualLocalAuth)
-#if (UseServer)
-using Microsoft.AspNetCore.Components.Authorization;
-#endif
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 #endif
@@ -41,9 +38,6 @@
 #if (IndividualLocalAuth)
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddScoped<IdentityRedirectManager>();
-#if (UseServer)
-builder.Services.AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>();
-#endif
 
 builder.Services.AddAuthentication(options =>
     {
@@ -103,11 +97,19 @@
 app.MapStaticAssets();
 #if (UseServer && UseWebAssembly)
 app.MapRazorComponents<App>()
+#if (IndividualLocalAuth)
+    .AddInteractiveServerRenderMode(options => options.ConfigureIdentityAuthenticationRefresh())
+#else
     .AddInteractiveServerRenderMode()
+#endif
     .AddInteractiveWebAssemblyRenderMode()
 #elif (UseServer)
 app.MapRazorComponents<App>()
+#if (IndividualLocalAuth)
+    .AddInteractiveServerRenderMode(options => options.ConfigureIdentityAuthenticationRefresh());
+#else
     .AddInteractiveServerRenderMode();
+#endif
 #elif (UseWebAssembly)
 app.MapRazorComponents<App>()
     .AddInteractiveWebAssemblyRenderMode()
diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index c908aad66194..d3193c592f5d 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -799,7 +799,6 @@
         "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "Components/Account/IdentityNoOpEmailSender.cs",
         "Components/Account/IdentityRedirectManager.cs",
-        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
         "Components/Account/Pages/AccessDenied.razor",
         "Components/Account/Pages/ConfirmEmail.razor",
         "Components/Account/Pages/ConfirmEmailChange.razor",
@@ -928,7 +927,6 @@
         "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "Components/Account/IdentityNoOpEmailSender.cs",
         "Components/Account/IdentityRedirectManager.cs",
-        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
         "Components/Account/Pages/AccessDenied.razor",
         "Components/Account/Pages/ConfirmEmail.razor",
         "Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1353,7 +1351,6 @@
         "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
-        "{ProjectName}/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1813,7 +1810,6 @@
         "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
-        "{ProjectName}/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1890,7 +1886,6 @@
         "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "Components/Account/IdentityNoOpEmailSender.cs",
         "Components/Account/IdentityRedirectManager.cs",
-        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
         "Components/Account/Pages/AccessDenied.razor",
         "Components/Account/Pages/ConfirmEmail.razor",
         "Components/Account/Pages/ConfirmEmailChange.razor",
@@ -2172,7 +2167,6 @@
         "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
-        "{ProjectName}/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",