diff --git a/Microsoft.Azure.Cosmos/src/CosmosClient.cs b/Microsoft.Azure.Cosmos/src/CosmosClient.cs
index d4ca04d276..709ce34cc8 100644
--- a/Microsoft.Azure.Cosmos/src/CosmosClient.cs
+++ b/Microsoft.Azure.Cosmos/src/CosmosClient.cs
@@ -6,6 +6,7 @@ namespace Microsoft.Azure.Cosmos
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Net;
     using System.Text;
     using System.Threading;
@@ -119,6 +120,15 @@ static CosmosClient()
             // NOTE: Native ServiceInteropWrapper.AssembliesExist has appsettings dependency which are proofed for CTL (native dll entry) scenarios.
             // Revert of this depends on handling such in direct assembly
             ServiceInteropWrapper.AssembliesExist = new Lazy<bool>(() => true);
+
+            Microsoft.Azure.Cosmos.Core.Trace.DefaultTrace.InitEventListener();
+
+            // If a debugger is not attached remove the DefaultTraceListener. 
+            // DefaultTraceListener can cause lock contention leading to availability issues
+            if (!Debugger.IsAttached)
+            {
+                CosmosClient.RemoveDefaultTraceListener();
+            }
         }
 
         /// <summary>
@@ -257,7 +267,7 @@ internal CosmosClient(
             this.ClientContext = ClientContextCore.Create(
                 this,
                 clientOptions);
-  
+
             this.ClientConfigurationTraceDatum = new ClientConfigurationTraceDatum(this.ClientContext, DateTime.UtcNow);
         }
 
@@ -1033,6 +1043,31 @@ public virtual Task<ResponseMessage> CreateDatabaseStreamAsync(
                  });
         }
 
+        /// <summary>
+        /// Removes the DefaultTraceListener which causes locking issues which leads to avability problems. 
+        /// </summary>
+        private static void RemoveDefaultTraceListener()
+        {
+            if (Core.Trace.DefaultTrace.TraceSource.Listeners.Count > 0)
+            {
+                List<DefaultTraceListener> removeDefaultTraceListeners = new List<DefaultTraceListener>();
+                foreach (object traceListnerObject in Core.Trace.DefaultTrace.TraceSource.Listeners)
+                {
+                    // The TraceSource already has the default trace listener
+                    if (traceListnerObject is DefaultTraceListener defaultTraceListener)
+                    {
+                        removeDefaultTraceListeners.Add(defaultTraceListener);
+                    }
+                }
+
+                // Remove all the default trace listeners
+                foreach (DefaultTraceListener defaultTraceListener in removeDefaultTraceListeners)
+                {
+                    Core.Trace.DefaultTrace.TraceSource.Listeners.Remove(defaultTraceListener);
+                }
+            }
+        }
+
         internal virtual async Task<ConsistencyLevel> GetAccountConsistencyLevelAsync()
         {
             if (!this.accountConsistencyLevel.HasValue)
diff --git a/Microsoft.Azure.Cosmos/src/DocumentClient.cs b/Microsoft.Azure.Cosmos/src/DocumentClient.cs
index 540b9291b4..c9bc0b348f 100644
--- a/Microsoft.Azure.Cosmos/src/DocumentClient.cs
+++ b/Microsoft.Azure.Cosmos/src/DocumentClient.cs
@@ -646,8 +646,6 @@ internal virtual void Initialize(Uri serviceEndpoint,
                 throw new ArgumentNullException("serviceEndpoint");
             }
 
-            DefaultTrace.InitEventListener();
-
             this.queryPartitionProvider = new AsyncLazy<QueryPartitionProvider>(async () =>
             {
                 await this.EnsureValidClientAsync(NoOpTrace.Singleton);
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/DefaultTracingTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/DefaultTracingTests.cs
new file mode 100644
index 0000000000..c17b9344de
--- /dev/null
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/DefaultTracingTests.cs
@@ -0,0 +1,56 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+namespace Microsoft.Azure.Cosmos.Tests
+{
+    using System;
+    using System.Diagnostics;
+    using System.Net.Http;
+    using System.Reflection;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Azure.Cosmos.Core.Trace;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using Moq;
+
+    [TestClass]
+    public class DefaultTracingTests
+    {
+        [TestMethod]
+        public void DefaultTracingEnableTest()
+        {
+            // Access cosmos client to cause the static consturctor to get called
+            Assert.IsTrue(CosmosClient.numberOfClientsCreated >= 0);
+
+            if (!Debugger.IsAttached)
+            {
+                Assert.IsFalse(this.DefaultTraceHasDefaultTraceListener());
+                DefaultTrace.TraceSource.Listeners.Add(new DefaultTraceListener());
+            }
+            
+            Assert.IsTrue(this.DefaultTraceHasDefaultTraceListener());
+            typeof(CosmosClient).GetMethod("RemoveDefaultTraceListener", BindingFlags.Static | BindingFlags.NonPublic).Invoke(null, null);
+            //CosmosClient.RemoveDefaultTraceListener();
+            Assert.IsFalse(this.DefaultTraceHasDefaultTraceListener());
+        }
+
+        private bool DefaultTraceHasDefaultTraceListener()
+        {
+            if (DefaultTrace.TraceSource.Listeners.Count == 0)
+            {
+                return false;
+            }
+
+            foreach (TraceListener listener in DefaultTrace.TraceSource.Listeners)
+            {
+                if (listener is DefaultTraceListener)
+                {
+                    return true;
+                }
+            }
+
+            DefaultTrace.TraceSource.Listeners.Clear();
+            return false;
+        }
+    }
+}
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/GatewayStoreModelTest.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/GatewayStoreModelTest.cs
index 190f8d7e4b..bb79ef970d 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/GatewayStoreModelTest.cs
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/GatewayStoreModelTest.cs
@@ -60,7 +60,7 @@ void TraceHandler(string message)
                 {
                     Assert.IsFalse(failedToResolve, "Failure to resolve should happen only once.");
                     failedToResolve = true;
-                    didNotRetryMessage = message.Substring(failedToResolveMessage.Length).Split('\n')[0];
+                    didNotRetryMessage = message[failedToResolveMessage.Length..].Split('\n')[0];
                 }
 
                 if (failedToResolve && message.Contains("NOT be retried") && message.Contains(didNotRetryMessage))
@@ -71,24 +71,36 @@ void TraceHandler(string message)
                 Console.WriteLine(message);
             }
 
-            DefaultTrace.TraceSource.Listeners.Add(new TestTraceListener { Callback = TraceHandler });
+            TestTraceListener testTraceListener = new TestTraceListener { Callback = TraceHandler };
+            DefaultTrace.TraceSource.Listeners.Add(testTraceListener);
+            DefaultTrace.InitEventListener();
 
             try
             {
-                DocumentClient myclient = new DocumentClient(new Uri(accountEndpoint), "base64encodedurl",
-                    new ConnectionPolicy
-                    {
-                    });
+                try
+                {
+                    DocumentClient myclient = new DocumentClient(new Uri(accountEndpoint), "base64encodedurl",
+                        new ConnectionPolicy
+                        {
+                        });
 
-                await myclient.OpenAsync();
+                    await myclient.OpenAsync();
+                }
+                catch
+                {
+                }
+
+                DefaultTrace.TraceSource.Flush();
+
+                // it should fail fast and not into the retry logic.
+                Assert.IsTrue(failedToResolve, "OpenAsync did not fail to resolve. No matching trace was received.");
+                Assert.IsTrue(didNotRetry, "OpenAsync did not fail without retrying. No matching trace was received.");
             }
-            catch
+            finally
             {
+                
+                DefaultTrace.TraceSource.Listeners.Remove(testTraceListener);
             }
-
-            // it should fail fast and not into the retry logic.
-            Assert.IsTrue(failedToResolve, "OpenAsync did not fail to resolve. No matching trace was received.");
-            Assert.IsTrue(didNotRetry, "OpenAsync did not fail without retrying. No matching trace was received.");
         }
 
         /// <summary>