diff --git a/9.0/BlazorWebAppEntra/BlazorWebAppEntra/Program.cs b/9.0/BlazorWebAppEntra/BlazorWebAppEntra/Program.cs
index 2e543b2f..2e987200 100644
--- a/9.0/BlazorWebAppEntra/BlazorWebAppEntra/Program.cs
+++ b/9.0/BlazorWebAppEntra/BlazorWebAppEntra/Program.cs
@@ -8,10 +8,12 @@
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
+// Remove or set 'SerializeAllClaims' to 'false' if you only want to 
+// serialize name and role claims for CSR.
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents()
     .AddInteractiveWebAssemblyComponents()
-    .AddAuthenticationStateSerialization();
+    .AddAuthenticationStateSerialization(options => options.SerializeAllClaims = true);
 
 builder.Services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
     .AddMicrosoftIdentityWebApp(builder.Configuration.GetSection("AzureAd"))
diff --git a/9.0/BlazorWebAppEntraBff/BlazorWebAppEntra/Program.cs b/9.0/BlazorWebAppEntraBff/BlazorWebAppEntra/Program.cs
index 4767e4e3..0fe560d4 100644
--- a/9.0/BlazorWebAppEntraBff/BlazorWebAppEntra/Program.cs
+++ b/9.0/BlazorWebAppEntraBff/BlazorWebAppEntra/Program.cs
@@ -27,11 +27,13 @@
 
 builder.Services.AddCascadingAuthenticationState();
 
+// Remove or set 'SerializeAllClaims' to 'false' if you only want to 
+// serialize name and role claims for CSR.
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents()
     .AddMicrosoftIdentityConsentHandler()
     .AddInteractiveWebAssemblyComponents()
-    .AddAuthenticationStateSerialization();
+    .AddAuthenticationStateSerialization(options => options.SerializeAllClaims = true);
 
 builder.Services.AddHttpForwarderWithServiceDiscovery();
 builder.Services.AddHttpContextAccessor();
diff --git a/9.0/BlazorWebAppOidc/BlazorWebAppOidc/Program.cs b/9.0/BlazorWebAppOidc/BlazorWebAppOidc/Program.cs
index 08e5d990..34ba7dd7 100644
--- a/9.0/BlazorWebAppOidc/BlazorWebAppOidc/Program.cs
+++ b/9.0/BlazorWebAppOidc/BlazorWebAppOidc/Program.cs
@@ -149,10 +149,12 @@
 
 builder.Services.AddCascadingAuthenticationState();
 
+// Remove or set 'SerializeAllClaims' to 'false' if you only want to 
+// serialize name and role claims for CSR.
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents()
     .AddInteractiveWebAssemblyComponents()
-    .AddAuthenticationStateSerialization();
+    .AddAuthenticationStateSerialization(options => options.SerializeAllClaims = true);
 
 builder.Services.AddScoped<IWeatherForecaster, ServerWeatherForecaster>();
 
diff --git a/9.0/BlazorWebAppOidcBff/BlazorWebAppOidc/Program.cs b/9.0/BlazorWebAppOidcBff/BlazorWebAppOidc/Program.cs
index 260025e8..2ae942d2 100644
--- a/9.0/BlazorWebAppOidcBff/BlazorWebAppOidc/Program.cs
+++ b/9.0/BlazorWebAppOidcBff/BlazorWebAppOidc/Program.cs
@@ -154,10 +154,12 @@
 
 builder.Services.AddCascadingAuthenticationState();
 
+// Remove or set 'SerializeAllClaims' to 'false' if you only want to 
+// serialize name and role claims for CSR.
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents()
     .AddInteractiveWebAssemblyComponents()
-    .AddAuthenticationStateSerialization();
+    .AddAuthenticationStateSerialization(options => options.SerializeAllClaims = true);
 
 builder.Services.AddHttpForwarderWithServiceDiscovery();
 builder.Services.AddHttpContextAccessor();