diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index 4d3b6227ea..eb58a57945 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -869,6 +869,7 @@
         <property name="quickShareService" ref="QuickShareService" />
         <property name="moduleService" ref="ModuleService" />
         <property name="assistant" ref="apiAssistant" />
+        <property name="enabled" value="${system.api.discovery.enabled}" />
     </bean>
 
     <!-- OpenCMIS -->
diff --git a/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java b/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
index e9b0921e95..62a4b49717 100644
--- a/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
+++ b/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
@@ -31,6 +31,7 @@ import org.alfresco.rest.api.model.RepositoryInfo;
 import org.alfresco.rest.api.model.RepositoryInfo.LicenseInfo;
 import org.alfresco.rest.api.model.RepositoryInfo.StatusInfo;
 import org.alfresco.rest.api.model.RepositoryInfo.VersionInfo;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
 import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
 import org.alfresco.rest.framework.tools.ApiAssistant;
 import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
@@ -65,6 +66,9 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
     private ModuleService moduleService;
     private ApiAssistant assistant;
 
+    private boolean enabled = true;
+    private final static String DISABLED = "Not Implemented";
+
     public void setDescriptorService(DescriptorService descriptorService)
     {
         this.descriptorService = descriptorService;
@@ -111,6 +115,8 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
     {
         try
         {
+            checkEnabled();
+
             DiscoveryDetails discoveryDetails = new DiscoveryDetails(getRepositoryInfo());
             // Write response
             setResponse(webScriptResponse, DEFAULT_SUCCESS);
@@ -165,4 +171,17 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
             objectMapper.writeValue(generator, obj);
         });
     }
+
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+
+    private void checkEnabled()
+    {
+        if (!enabled)
+        {
+            throw new DisabledServiceException(DISABLED);
+        }
+    }
 }