diff --git a/src/Libraries/Microsoft.AspNetCore.AsyncState/AsyncStateHttpContextExtensions.cs b/src/Libraries/Microsoft.AspNetCore.AsyncState/AsyncStateHttpContextExtensions.cs
index 6c289c96f77..d9141dbf83e 100644
--- a/src/Libraries/Microsoft.AspNetCore.AsyncState/AsyncStateHttpContextExtensions.cs
+++ b/src/Libraries/Microsoft.AspNetCore.AsyncState/AsyncStateHttpContextExtensions.cs
@@ -16,6 +16,7 @@ public static class AsyncStateHttpContextExtensions
     /// <summary>
     /// Adds default implementations for <see cref="IAsyncState"/>, <see cref="IAsyncContext{T}"/>, and <see cref="IAsyncLocalContext{T}"/> services,
     /// scoped to the lifetime of <see cref="AspNetCore.Http.HttpContext"/> instances.
+    /// Please note that implementations of these interfaces are not thread safe.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
     /// <returns>The value of <paramref name="services"/>.</returns>
diff --git a/src/Libraries/Microsoft.AspNetCore.AsyncState/README.md b/src/Libraries/Microsoft.AspNetCore.AsyncState/README.md
index d53fafcbfd5..ec93c727704 100644
--- a/src/Libraries/Microsoft.AspNetCore.AsyncState/README.md
+++ b/src/Libraries/Microsoft.AspNetCore.AsyncState/README.md
@@ -5,7 +5,7 @@ This provides the ability to store and retrieve state objects that flow with the
 The lifetime of the shared data is controlled automatically and will be the same as of `HttpContext`.
 
 > [!NOTE]
-> Please note, the implementation `IAsyncContext<T>` is not designed to be thread-safe.
+> Please note, the implementation of `IAsyncContext<T>` is not designed to be thread-safe.
 
 ## Install the package
 
diff --git a/src/Libraries/Microsoft.Extensions.AsyncState/AsyncStateExtensions.cs b/src/Libraries/Microsoft.Extensions.AsyncState/AsyncStateExtensions.cs
index 9baabc82d3a..a25a8156b1a 100644
--- a/src/Libraries/Microsoft.Extensions.AsyncState/AsyncStateExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AsyncState/AsyncStateExtensions.cs
@@ -15,6 +15,7 @@ public static class AsyncStateExtensions
 {
     /// <summary>
     /// Adds default implementations for <see cref="IAsyncState"/>, <see cref="IAsyncContext{T}"/>, and <see cref="IAsyncLocalContext{T}"/> services.
+    /// Please note that implementations of these interfaces are not thread safe.
     /// </summary>
     /// <param name="services">The dependency injection container to add the implementations to.</param>
     /// <returns>The value of <paramref name="services"/>.</returns>
diff --git a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncContext.cs b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncContext.cs
index f1c07ee94f8..aef151f3016 100644
--- a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncContext.cs
+++ b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncContext.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Extensions.AsyncState;
 
 /// <summary>
 /// Provides access to the current async context.
+/// Some implementations of this interface may not be thread safe.
 /// </summary>
 /// <typeparam name="T">The type of the asynchronous state.</typeparam>
 [SuppressMessage("Naming", "CA1716:Identifiers should not match keywords", Justification = "Getter and setter throw exceptions.")]
diff --git a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs
index 746909d1b8c..9873375a78b 100644
--- a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs
+++ b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs
@@ -7,6 +7,7 @@ namespace Microsoft.Extensions.AsyncState;
 
 /// <summary>
 /// Provides access to the current async context stored outside of the HTTP pipeline.
+/// Some implementations of this interface may not be thread safe.
 /// </summary>
 /// <typeparam name="T">The type of the asynchronous state.</typeparam>
 /// <remarks>This type is intended for internal use. Use <see cref="IAsyncContext{T}"/> instead.</remarks>
diff --git a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncState.cs b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncState.cs
index 960d6672967..ec15b72c2c9 100644
--- a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncState.cs
+++ b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncState.cs
@@ -9,6 +9,7 @@ namespace Microsoft.Extensions.AsyncState;
 
 /// <summary>
 /// Encapsulates all information within the asynchronous flow in an <see cref="AsyncLocal{T}"/> variable.
+/// Some implementations of this interface may not be thread safe.
 /// </summary>
 [SuppressMessage("Naming", "CA1716:Identifiers should not match keywords", Justification = "Getter and setter throw exceptions.")]
 public interface IAsyncState