diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ExplicitRouter.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ExplicitRouter.java
index 716e6456e..131cbf406 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ExplicitRouter.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ExplicitRouter.java
@@ -16,7 +16,8 @@ public class ExplicitRouter implements DocRouter {
 
     @Override
     public boolean routeAcl(int shardCount, int shardInstance, Acl acl) {
-        return shardId == shardInstance;
+        //all acls go to all shards.
+        return true;
     }
 
     @Override
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerTest.java
index 446a86c84..abef2520f 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerTest.java
@@ -106,7 +106,6 @@ public class DistributedExplicitShardRoutingTrackerTest extends AbstractAlfresco
             if ("shard1".endsWith(core.getName()))
             {
                 waitForDocCountCore(core, contentQuery, numNodes, 100000, begin);
-                waitForDocCountCore(core, aclQuery, numAcls, 100000, begin);
             }
         }
 
@@ -114,8 +113,8 @@ public class DistributedExplicitShardRoutingTrackerTest extends AbstractAlfresco
         assertShardCount(0, contentQuery, 0);
         assertShardCount(2, contentQuery, 0);
 
-        assertShardCount(0, aclQuery, 0);
-        assertShardCount(2, aclQuery, 0);
+        //Acls go to all cores
+        waitForDocCountAllCores(aclQuery, numAcls, 20000);
     }
 
     protected Properties getProperties()