diff --git a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
index b89ee7d00a..c32e427baa 100644
--- a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
+++ b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
@@ -133,6 +133,9 @@ public class ModuleComponentHelper
         this.tenantAdminService = tenantAdminService;
     }
     
+    /**
+     * @throws UnsupportedOperationException This feature was never active and cannot be used (ALF-19207)
+     */
     public void setApplyToTenants(boolean applyToTenants)
     {
         throw new UnsupportedOperationException("Applying modules to individual tenants is unsupported. See ALF-19207: MT module startup does not work");
diff --git a/source/java/org/alfresco/repo/module/ModuleServiceImpl.java b/source/java/org/alfresco/repo/module/ModuleServiceImpl.java
index 44e2895b70..fd3da5d821 100644
--- a/source/java/org/alfresco/repo/module/ModuleServiceImpl.java
+++ b/source/java/org/alfresco/repo/module/ModuleServiceImpl.java
@@ -110,9 +110,12 @@ public class ModuleServiceImpl implements ApplicationContextAware, ModuleService
         this.moduleComponentHelper.setTenantAdminService(tenantAdminService);
     }
     
+    /**
+     * @throws UnsupportedOperationException This feature was never active and cannot be used (ALF-19207)
+     */
     public void setApplyToTenants(boolean applyToTenants)
     {
-        this.moduleComponentHelper.setApplyToTenants(applyToTenants);
+        throw new UnsupportedOperationException("Applying modules to individual tenants is unsupported. See ALF-19207: MT module startup does not work");
     }
     
     @Override