diff --git a/src/OpenIddict.Client/OpenIddictClientHandlers.cs b/src/OpenIddict.Client/OpenIddictClientHandlers.cs
index e9d1a7cdf..8dabf053e 100644
--- a/src/OpenIddict.Client/OpenIddictClientHandlers.cs
+++ b/src/OpenIddict.Client/OpenIddictClientHandlers.cs
@@ -851,7 +851,7 @@ public sealed class ResolveClientRegistrationFromStateToken : IOpenIddictClientH
             = OpenIddictClientHandlerDescriptor.CreateBuilder<ProcessAuthenticationContext>()
                 .AddFilter<RequireStateTokenPrincipal>()
                 .UseSingletonHandler<ResolveClientRegistrationFromStateToken>()
-                .SetOrder(ValidateRequestForgeryProtection.Descriptor.Order + 1_000)
+                .SetOrder(ValidateEndpointUri.Descriptor.Order + 1_000)
                 .Build();
 
         /// <inheritdoc/>