diff --git a/sdk/core/Azure.Core/src/DiagnosticsOptions.cs b/sdk/core/Azure.Core/src/DiagnosticsOptions.cs
index 9b49616a2f9e..dc9bd9154847 100644
--- a/sdk/core/Azure.Core/src/DiagnosticsOptions.cs
+++ b/sdk/core/Azure.Core/src/DiagnosticsOptions.cs
@@ -18,10 +18,29 @@ internal DiagnosticsOptions()
             ApplicationId = DefaultApplicationId;
             LoggedHeaderNames = new List<string>()
             {
-                "Date",
-                "traceparent",
                 "x-ms-client-request-id",
-                "x-ms-request-id"
+                "x-ms-return-client-request-id",
+                "traceparent",
+
+                "Accept",
+                "Cache-Control",
+                "Connection",
+                "Content-Length",
+                "Content-Type",
+                "Date",
+                "ETag",
+                "Expires",
+                "If-Match",
+                "If-Modified-Since",
+                "If-None-Match",
+                "If-Unmodified-Since",
+                "Last-Modified",
+                "Pragma",
+                "Request-Id",
+                "Retry-After",
+                "Server",
+                "Transfer-Encoding",
+                "User-Agent"
             };
             LoggedQueryParameters = new List<string>();
         }