diff --git a/docs/README.md b/docs/README.md
index 623127827..b11008b7d 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -44,7 +44,6 @@ If you or your business use oidc-provider, please consider becoming a [Patron][s
     - [clientCredentials](#featuresclientcredentials)
     - [devInteractions](#featuresdevinteractions)
     - [deviceFlow](#featuresdeviceflow)
-    - [discovery](#featuresdiscovery)
     - [encryption](#featuresencryption)
     - [frontchannelLogout](#featuresfrontchannellogout)
     - [introspection](#featuresintrospection)
@@ -985,20 +984,6 @@ html>`;
 
 </details>
 
-### features.discovery
-
-[Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html)  
-
-Exposes `/.well-known/openid-configuration` endpoint with your provider's actual configuration, i.e. Available claims, features and so on.  
-
-
-_**default value**_:
-```js
-{
-  enabled: true
-}
-```
-
 ### features.encryption
 
 Enables encryption features such as receiving encrypted UserInfo responses, encrypted ID Tokens and allow receiving encrypted Request Objects.  
diff --git a/lib/helpers/defaults.js b/lib/helpers/defaults.js
index 6ad827ef2..862cc7c73 100644
--- a/lib/helpers/defaults.js
+++ b/lib/helpers/defaults.js
@@ -350,16 +350,6 @@ const DEFAULTS = {
      */
     devInteractions: { enabled: true },
 
-    /*
-     * features.discovery
-     *
-     * title: [Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html)
-     *
-     * description: Exposes `/.well-known/openid-configuration` endpoint with your provider's actual
-     * configuration, i.e. available claims, features and so on.
-     */
-    discovery: { enabled: true },
-
     /*
      * features.requestUri
      *
diff --git a/lib/helpers/features.js b/lib/helpers/features.js
index 1bf5ef61c..5197c7e60 100644
--- a/lib/helpers/features.js
+++ b/lib/helpers/features.js
@@ -2,10 +2,8 @@ const STABLE = new Set([
   'claimsParameter',
   'clientCredentials',
   'devInteractions',
-  'discovery',
   'encryption',
   'introspection',
-  'pkce',
   'registration',
   'registrationManagement',
   'request',
diff --git a/lib/helpers/initialize_app.js b/lib/helpers/initialize_app.js
index 33ccea73a..e5ed1932b 100644
--- a/lib/helpers/initialize_app.js
+++ b/lib/helpers/initialize_app.js
@@ -153,6 +153,9 @@ module.exports = function initializeApp() {
   get('certificates', routes.certificates, CORS.open, error(this, 'certificates.error'), certificates);
   options('cors.certificates', routes.certificates, CORS.open);
 
+  get('discovery', discoveryRoute, CORS.open, error(this, 'discovery.error'), discovery);
+  options('cors.discovery', discoveryRoute, CORS.open);
+
   if (configuration.features.registration.enabled) {
     const clientRoute = `${routes.registration}/:clientId`;
 
@@ -177,11 +180,6 @@ module.exports = function initializeApp() {
     options('cors.introspection', routes.introspection, CORS.client);
   }
 
-  if (configuration.features.discovery.enabled) {
-    get('discovery', discoveryRoute, CORS.open, error(this, 'discovery.error'), discovery);
-    options('cors.discovery', discoveryRoute, CORS.open);
-  }
-
   if (configuration.features.sessionManagement.enabled) {
     get('check_session', routes.check_session, error(this, 'check_session.error'), checkSession.get);
     post('check_session_origin', routes.check_session, error(this, 'check_session_origin.error'), ...checkSession.post);