diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.Introspection.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.Introspection.cs
index 12f738e7..e31f4df4 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.Introspection.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.Introspection.cs
@@ -930,6 +930,7 @@ namespace OpenIddict.Server
 
             /// <summary>
             /// Contains the logic responsible of attaching the application-specific claims extracted from the token the event context.
+            /// Note: this handler is not used when the degraded mode is enabled.
             /// </summary>
             public class AttachApplicationClaims : IOpenIddictServerHandler<HandleIntrospectionRequestContext>
             {
@@ -1048,7 +1049,7 @@ namespace OpenIddict.Server
 
                         JsonClaimValueTypes.Json      => JToken.Parse(claim.Value),
                         JsonClaimValueTypes.JsonArray => JToken.Parse(claim.Value),
-                        
+
                         _ => new OpenIddictParameter(claim.Value)
                     };
                 }
diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.Revocation.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.Revocation.cs
index 6424800d..b51b07ab 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.Revocation.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.Revocation.cs
@@ -847,6 +847,7 @@ namespace OpenIddict.Server
                 /// </summary>
                 public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                     = OpenIddictServerHandlerDescriptor.CreateBuilder<HandleRevocationRequestContext>()
+                        .AddFilter<RequireDegradedModeDisabled>()
                         .UseScopedHandler<RevokeToken>()
                         .SetOrder(AttachPrincipal.Descriptor.Order + 1_000)
                         .Build();