diff --git a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
index a85db42e91..b8a3ccb4a5 100755
--- a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
+++ b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
@@ -535,9 +535,13 @@ public class MultiTServiceImpl implements TenantService
     
     protected void checkTenantEnabled(String tenantDomain)
     {
-        if (getTenant(tenantDomain).isEnabled() == false)
+        // note: System user can access disabled tenants
+        if (! getBaseNameUser(AuthenticationUtil.getCurrentUserName()).equals(AuthenticationUtil.getSystemUserName()))
         {
-            throw new AlfrescoRuntimeException("Tenant is not enabled: " + tenantDomain);
+            if (getTenant(tenantDomain).isEnabled() == false)
+            {
+                throw new AlfrescoRuntimeException("Tenant is not enabled: " + tenantDomain);
+            }
         }
     }