diff --git a/Microsoft.Azure.Cosmos/src/Resource/ClientContextCore.cs b/Microsoft.Azure.Cosmos/src/Resource/ClientContextCore.cs
index b2db7e7107..abe57bbcd2 100644
--- a/Microsoft.Azure.Cosmos/src/Resource/ClientContextCore.cs
+++ b/Microsoft.Azure.Cosmos/src/Resource/ClientContextCore.cs
@@ -286,6 +286,7 @@ private Task<TResult> OperationHelperWithRootTraceWithSynchronizationContextAsyn
 
                 using (ITrace trace = disableDiagnostics ? NoOpTrace.Singleton : (ITrace)Tracing.Trace.GetRootTrace(operationName, traceComponent, traceLevel))
                 {
+                    trace.AddDatum("Client Configuration", this.client.ClientConfigurationTraceDatum);
                     trace.AddDatum("Synchronization Context", syncContextVirtualAddress);
 
                     return await this.RunWithDiagnosticsHelperAsync(
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/SynchronizationContextTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/SynchronizationContextTests.cs
index a51a77f14f..fd7ab80eb0 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/SynchronizationContextTests.cs
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/SynchronizationContextTests.cs
@@ -85,6 +85,7 @@ public void VerifySynchronizationContextDoesNotLock(bool withClientTelemetry)
                         Assert.IsNotNull(response);
                         string diagnostics = response.Diagnostics.ToString();
                         Assert.IsTrue(diagnostics.Contains("Synchronization Context"));
+                        Assert.IsTrue(diagnostics.Contains("Client Configuration"));
 
                         using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();