diff --git a/src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java b/src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
index f0f6b856f9..7325f50529 100644
--- a/src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
+++ b/src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
@@ -145,6 +145,7 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
         }
         Descriptor serverDescriptor = descriptorService.getServerDescriptor();
         return new RepositoryInfo()
+                    .setId(descriptorService.getCurrentRepositoryDescriptor().getId())
                     .setEdition(serverDescriptor.getEdition())
                     .setVersion(new VersionInfo(serverDescriptor))
                     .setLicense(licenseInfo)
diff --git a/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java b/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java
index e563df01e4..d9289b9294 100644
--- a/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java
+++ b/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java
@@ -44,12 +44,24 @@ import java.util.stream.Collectors;
  */
 public class RepositoryInfo
 {
+    private String id;
     private String edition;
     private VersionInfo version;
     private LicenseInfo license;
     private StatusInfo status;
     private List<ModulePackage> modules;
 
+    public String getId()
+    {
+        return id;
+    }
+
+    public RepositoryInfo setId(String id)
+    {
+        this.id = id;
+        return this;
+    }
+
     public String getEdition()
     {
         return edition;
diff --git a/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java b/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
index b6d393dadf..6cfbdb9885 100644
--- a/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
+++ b/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
@@ -74,6 +74,8 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
     @Mock
     private Descriptor serverDescriptor;
     @Mock
+    private Descriptor currentRepositoryDescriptor;
+    @Mock
     private LicenseDescriptor licenseDescriptorMock;
     private DiscoveryApiWebscript discoveryApiWebscript;
 
@@ -94,6 +96,8 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
         this.licenseDescriptorMock = mock(LicenseDescriptor.class);
 
         when(descriptorServiceMock.getServerDescriptor()).thenReturn(serverDescriptor);
+        when(descriptorServiceMock.getCurrentRepositoryDescriptor()).thenReturn(currentRepositoryDescriptor);
+        when(currentRepositoryDescriptor.getId()).thenReturn("repoId");
         when(serverDescriptor.getEdition()).thenReturn("Enterprise");
         when(serverDescriptor.getVersionMajor()).thenReturn("5");
         when(serverDescriptor.getVersionMinor()).thenReturn("2");
@@ -143,6 +147,7 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
         assertNotNull(discoveryDetails);
         RepositoryInfo repositoryInfo = discoveryDetails.getRepository();
         assertNotNull(repositoryInfo);
+        assertEquals("repoId", repositoryInfo.getId());
         assertEquals("Enterprise", repositoryInfo.getEdition());
 
         // Check version info