diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 00ed868ae9..129d0635c3 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -258,3 +258,4 @@ patch.webSiteAddModerated.result=Changed Web Site visibility.
 
 patch.mtShareExistingTenants.description=Update existing tenants for MT Share.
 patch.mtShareExistingTenants.result=Update existing tenants for MT Share.
+patch.mtShareExistingTenants.result.not_applicable=Patch applied, although no changes made since MT is not enabled.
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java
index bc0f7e4f0c..af6bd64862 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java
@@ -38,7 +38,8 @@ import org.alfresco.repo.workflow.WorkflowDeployer;
  */
 public class MultiTShareExistingTenantsPatch extends AbstractPatch
 {
-    private static final String MSG_RESULT = "patch.mtShareExitingTenants.result";
+    private static final String MSG_RESULT = "patch.mtShareExistingTenants.result";
+    private static final String MSG_RESULT_NA = "patch.mtShareExistingTenants.result.not_applicable";
     
     private SiteAVMBootstrap siteBootstrap;
     private WorkflowDeployer workflowPatchDeployer;
@@ -81,6 +82,11 @@ public class MultiTShareExistingTenantsPatch extends AbstractPatch
     @Override
     protected String applyInternal() throws Exception
     {
+        if (!tenantService.isEnabled())
+        {
+            return I18NUtil.getMessage(MSG_RESULT_NA);
+        }
+        
         if (! tenantService.getCurrentUserDomain().equals(TenantService.DEFAULT_DOMAIN))
         {
             this.siteBootstrap.bootstrap();