diff --git a/src/OpenIddict.Server/OpenIddictServerBuilder.cs b/src/OpenIddict.Server/OpenIddictServerBuilder.cs
index 0b6e917d..4a8a1de1 100644
--- a/src/OpenIddict.Server/OpenIddictServerBuilder.cs
+++ b/src/OpenIddict.Server/OpenIddictServerBuilder.cs
@@ -1546,9 +1546,11 @@ public sealed class OpenIddictServerBuilder
     /// for the tokens and codes returned by the OpenIddict server.
     /// Using this option is generally NOT recommended as it prevents
     /// the tokens and codes from being revoked (if needed).
-    /// Note: disabling token storage requires disabling sliding
-    /// expiration or enabling rolling tokens.
     /// </summary>
+    /// <remarks>
+    /// Note: disabling token storage prevents the device authorization flow
+    /// from being used and automatically turns sliding expiration off.
+    /// </remarks>
     /// <returns>The <see cref="OpenIddictServerBuilder"/> instance.</returns>
     public OpenIddictServerBuilder DisableTokenStorage()
         => Configure(options => options.DisableTokenStorage = true);
diff --git a/src/OpenIddict.Server/OpenIddictServerOptions.cs b/src/OpenIddict.Server/OpenIddictServerOptions.cs
index 794ebf5d..c306f31b 100644
--- a/src/OpenIddict.Server/OpenIddictServerOptions.cs
+++ b/src/OpenIddict.Server/OpenIddictServerOptions.cs
@@ -298,6 +298,10 @@ public sealed class OpenIddictServerOptions
     /// returned by OpenIddict. Using this option is generally NOT recommended
     /// as it prevents the tokens and codes from being revoked (if needed).
     /// </summary>
+    /// <remarks>
+    /// Note: disabling token storage prevents the device authorization flow
+    /// from being used and automatically turns sliding expiration off.
+    /// </remarks>
     public bool DisableTokenStorage { get; set; }
 
     /// <summary>