diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/RevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/RevalidatingAuthenticationStateProvider.cs
index 43932f618b..ab686398a0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/RevalidatingAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/RevalidatingAuthenticationStateProvider.cs
@@ -64,7 +64,7 @@ namespace RazorComponentsWeb_CSharp.Areas.Identity
                 {
                     // Force sign-out. Also stop the revalidation loop, because the user can
                     // only sign back in by starting a new connection.
-                    var anonymousUser = new ClaimsPrincipal();
+                    var anonymousUser = new ClaimsPrincipal(new ClaimsIdentity());
                     _currentAuthenticationStateTask = Task.FromResult(new AuthenticationState(anonymousUser));
                     NotifyAuthenticationStateChanged(_currentAuthenticationStateTask);
                     _loopCancellationTokenSource.Cancel();
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs
index 306308249e..7b1b0ab23c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs
@@ -67,8 +67,6 @@ namespace RazorComponentsWeb_CSharp
 #endif
             services.AddDefaultIdentity<IdentityUser>()
                 .AddEntityFrameworkStores<ApplicationDbContext>();
-
-            services.AddScoped<AuthenticationStateProvider, RevalidatingAuthenticationStateProvider<IdentityUser>>();
 #elif (OrganizationalAuth)
             services.AddAuthentication(AzureADDefaults.AuthenticationScheme)
                 .AddAzureAD(options => Configuration.Bind("AzureAd", options));
@@ -127,6 +125,9 @@ namespace RazorComponentsWeb_CSharp
 #endif
             services.AddRazorPages();
             services.AddServerSideBlazor();
+#if (IndividualLocalAuth)
+            services.AddScoped<AuthenticationStateProvider, RevalidatingAuthenticationStateProvider<IdentityUser>>();
+#endif
             services.AddSingleton<WeatherForecastService>();
         }