diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs
index 94f0e82eee..ba045c2919 100644
--- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs
+++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs
@@ -28,13 +28,13 @@ namespace Microsoft.AspNetCore.Builder
 }
 namespace Microsoft.AspNetCore.Components.Server
 {
-    public partial class CircuitOptions
+    public sealed partial class CircuitOptions
     {
         public CircuitOptions() { }
         public bool DetailedErrors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public int DisconnectedCircuitMaxRetained { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public System.TimeSpan DisconnectedCircuitRetentionPeriod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public System.TimeSpan JSInteropDefaultCallTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public int MaxRetainedDisconnectedCircuits { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
     public partial class ComponentPrerenderingContext
     {
diff --git a/src/Components/Server/src/CircuitOptions.cs b/src/Components/Server/src/CircuitOptions.cs
index b20bbb32a6..30c1b9c407 100644
--- a/src/Components/Server/src/CircuitOptions.cs
+++ b/src/Components/Server/src/CircuitOptions.cs
@@ -6,9 +6,9 @@ using System;
 namespace Microsoft.AspNetCore.Components.Server
 {
     /// <summary>
-    /// Options to configure ASP.NET Core Components.
+    /// Options to configure circuit handler for server-side Blazor 
     /// </summary>
-    public class CircuitOptions
+    public sealed class CircuitOptions
     {
         /// <summary>
         /// Gets or sets a value that determines the maximum number of disconnected circuit state details
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Components.Server
         /// <value>
         /// Defaults to <c>100</c>.
         /// </value>
-        public int MaxRetainedDisconnectedCircuits { get; set; } = 100;
+        public int DisconnectedCircuitMaxRetained { get; set; } = 100;
 
         /// <summary>
         /// Gets or sets a value that determines the maximum duration state for a disconnected circuit is
@@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Components.Server
         /// </para>
         /// <para>
         /// This value determines the maximium duration circuit state is retained by the server before being evicted.
-        /// <seealso cref="MaxRetainedDisconnectedCircuits"/>
+        /// <seealso cref="DisconnectedCircuitMaxRetained"/>
         /// </para>
         /// </summary>
         /// <value>
diff --git a/src/Components/Server/src/Circuits/CircuitRegistry.cs b/src/Components/Server/src/Circuits/CircuitRegistry.cs
index 2c57ce63f5..091d993548 100644
--- a/src/Components/Server/src/Circuits/CircuitRegistry.cs
+++ b/src/Components/Server/src/Circuits/CircuitRegistry.cs
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
             DisconnectedCircuits = new MemoryCache(new MemoryCacheOptions
             {
-                SizeLimit = _options.MaxRetainedDisconnectedCircuits,
+                SizeLimit = _options.DisconnectedCircuitMaxRetained,
             });
 
             _postEvictionCallback = new PostEvictionCallbackRegistration