diff --git a/src/OpenIddict/OpenIddictProvider.Discovery.cs b/src/OpenIddict/OpenIddictProvider.Discovery.cs
index 302db4d9..a73554a8 100644
--- a/src/OpenIddict/OpenIddictProvider.Discovery.cs
+++ b/src/OpenIddict/OpenIddictProvider.Discovery.cs
@@ -39,7 +39,7 @@ namespace OpenIddict
 
             // Note: the optional "claims" parameter is not supported by OpenIddict,
             // so a "false" flag is returned to encourage clients not to use it.
-            context.Metadata[OpenIdConnectConstants.Metadata.ClaimsSupported] = false;
+            context.Metadata[OpenIdConnectConstants.Metadata.ClaimsParameterSupported] = false;
 
             context.Metadata[OpenIddictConstants.Metadata.ExternalProvidersSupported] = new JArray(
                 from provider in context.HttpContext.Authentication.GetAuthenticationSchemes()
diff --git a/test/OpenIddict.Tests/OpenIddictProviderTests.Discovery.cs b/test/OpenIddict.Tests/OpenIddictProviderTests.Discovery.cs
index b8e4b691..23f16b13 100644
--- a/test/OpenIddict.Tests/OpenIddictProviderTests.Discovery.cs
+++ b/test/OpenIddict.Tests/OpenIddictProviderTests.Discovery.cs
@@ -138,6 +138,21 @@ namespace OpenIddict.Tests
                 ((JArray) response[OpenIdConnectConstants.Metadata.ScopesSupported]).Values<string>());
         }
 
+        [Fact]
+        public async Task HandleConfigurationRequest_ClaimsParameterSupportedIsReturned()
+        {
+            // Arrange
+            var server = CreateAuthorizationServer();
+
+            var client = new OpenIdConnectClient(server.CreateClient());
+
+            // Act
+            var response = await client.GetAsync(ConfigurationEndpoint);
+
+            // Assert
+            Assert.False((bool) response[OpenIdConnectConstants.Metadata.ClaimsParameterSupported]);
+        }
+
         [Fact]
         public async Task HandleConfigurationRequest_ExternalProvidersAreCorrectlyReturned()
         {