diff --git a/pkg/op/config.go b/pkg/op/config.go
index 385f8c7..9fec7cc 100644
--- a/pkg/op/config.go
+++ b/pkg/op/config.go
@@ -47,7 +47,6 @@ type Configuration interface {
 	RequestObjectSupported() bool
 	RequestObjectSigningAlgorithmsSupported() []string
 
-	SupportedClaims() []string
 	SupportedUILocales() []language.Tag
 	DeviceAuthorization() DeviceAuthorizationConfig
 }
diff --git a/pkg/op/discovery.go b/pkg/op/discovery.go
index 37006a5..6af1674 100644
--- a/pkg/op/discovery.go
+++ b/pkg/op/discovery.go
@@ -57,7 +57,7 @@ func CreateDiscoveryConfig(ctx context.Context, config Configuration, storage Di
 		IntrospectionEndpointAuthMethodsSupported:          AuthMethodsIntrospectionEndpoint(config),
 		RevocationEndpointAuthSigningAlgValuesSupported:    RevocationSigAlgorithms(config),
 		RevocationEndpointAuthMethodsSupported:             AuthMethodsRevocationEndpoint(config),
-		ClaimsSupported:                                    config.SupportedClaims(),
+		ClaimsSupported:                                    SupportedClaims(config),
 		CodeChallengeMethodsSupported:                      CodeChallengeMethods(config),
 		UILocalesSupported:                                 config.SupportedUILocales(),
 		RequestParameterSupported:                          config.RequestObjectSupported(),
@@ -88,7 +88,7 @@ func createDiscoveryConfigV2(ctx context.Context, config Configuration, storage
 		IntrospectionEndpointAuthMethodsSupported:          AuthMethodsIntrospectionEndpoint(config),
 		RevocationEndpointAuthSigningAlgValuesSupported:    RevocationSigAlgorithms(config),
 		RevocationEndpointAuthMethodsSupported:             AuthMethodsRevocationEndpoint(config),
-		ClaimsSupported:                                    config.SupportedClaims(),
+		ClaimsSupported:                                    SupportedClaims(config),
 		CodeChallengeMethodsSupported:                      CodeChallengeMethods(config),
 		UILocalesSupported:                                 config.SupportedUILocales(),
 		RequestParameterSupported:                          config.RequestObjectSupported(),
@@ -213,7 +213,12 @@ func AuthMethodsRevocationEndpoint(c Configuration) []oidc.AuthMethod {
 }
 
 func SupportedClaims(c Configuration) []string {
-	return c.SupportedClaims()
+	provider, ok := c.(*Provider)
+	if ok && provider.config.SupportedClaims != nil {
+		return provider.config.SupportedClaims
+	}
+
+	return DefaultSupportedClaims
 }
 
 func CodeChallengeMethods(c Configuration) []oidc.CodeChallengeMethod {
diff --git a/pkg/op/discovery_test.go b/pkg/op/discovery_test.go
index 27976cc..84e1216 100644
--- a/pkg/op/discovery_test.go
+++ b/pkg/op/discovery_test.go
@@ -544,11 +544,7 @@ func TestSupportedClaims(t *testing.T) {
 	}{
 		{
 			"scopes",
-			args{func() op.Configuration {
-				m := mock.NewMockConfiguration(gomock.NewController(t))
-				m.EXPECT().SupportedClaims().Return(op.DefaultSupportedClaims)
-				return m
-			}()},
+			args{},
 			[]string{
 				"sub",
 				"aud",
diff --git a/pkg/op/mock/configuration.mock.go b/pkg/op/mock/configuration.mock.go
index 77c2691..f392a45 100644
--- a/pkg/op/mock/configuration.mock.go
+++ b/pkg/op/mock/configuration.mock.go
@@ -358,20 +358,6 @@ func (mr *MockConfigurationMockRecorder) RevocationEndpointSigningAlgorithmsSupp
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevocationEndpointSigningAlgorithmsSupported", reflect.TypeOf((*MockConfiguration)(nil).RevocationEndpointSigningAlgorithmsSupported))
 }
 
-// SupportedClaims mocks base method.
-func (m *MockConfiguration) SupportedClaims() []string {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SupportedClaims")
-	ret0, _ := ret[0].([]string)
-	return ret0
-}
-
-// SupportedClaims indicates an expected call of SupportedClaims.
-func (mr *MockConfigurationMockRecorder) SupportedClaims() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SupportedClaims", reflect.TypeOf((*MockConfiguration)(nil).SupportedClaims))
-}
-
 // SupportedUILocales mocks base method.
 func (m *MockConfiguration) SupportedUILocales() []language.Tag {
 	m.ctrl.T.Helper()
diff --git a/pkg/op/op.go b/pkg/op/op.go
index d35725e..fdc073c 100644
--- a/pkg/op/op.go
+++ b/pkg/op/op.go
@@ -414,14 +414,6 @@ func (o *Provider) RequestObjectSigningAlgorithmsSupported() []string {
 	return []string{"RS256"}
 }
 
-func (o *Provider) SupportedClaims() []string {
-	if o.config.SupportedClaims == nil {
-		return DefaultSupportedClaims
-	} else {
-		return o.config.SupportedClaims
-	}
-}
-
 func (o *Provider) SupportedUILocales() []language.Tag {
 	return o.config.SupportedUILocales
 }