diff --git a/src/csharp/Grpc.Core.Api/ServerCallContext.cs b/src/csharp/Grpc.Core.Api/ServerCallContext.cs
index 7cc03cb3a0b..8d7dbf544d6 100644
--- a/src/csharp/Grpc.Core.Api/ServerCallContext.cs
+++ b/src/csharp/Grpc.Core.Api/ServerCallContext.cs
@@ -120,18 +120,7 @@ namespace Grpc.Core
         /// Gets a dictionary that can be used by the various interceptors and handlers of this
         /// call to store arbitrary state.
         /// </summary>
-        public virtual IDictionary<object, object> UserState
-        {
-            get
-            {
-                if (userState == null)
-                {
-                    userState = new Dictionary<object, object>();
-                }
-
-                return userState;
-            }
-        }
+        public IDictionary<object, object> UserState => UserStateCore;
 
         /// <summary>Provides implementation of a non-virtual public member.</summary>
         protected abstract Task WriteResponseHeadersAsyncCore(Metadata responseHeaders);
@@ -157,5 +146,18 @@ namespace Grpc.Core
         protected abstract WriteOptions WriteOptionsCore { get; set; }
         /// <summary>Provides implementation of a non-virtual public member.</summary>
         protected abstract AuthContext AuthContextCore { get; }
+        /// <summary>Provides implementation of a non-virtual public member.</summary>
+        protected virtual IDictionary<object, object> UserStateCore
+        {
+            get
+            {
+                if (userState == null)
+                {
+                    userState = new Dictionary<object, object>();
+                }
+
+                return userState;
+            }
+        }
     }
 }