diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AclTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AclTracker.java
index 207580cc1..8a56973ea 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AclTracker.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AclTracker.java
@@ -765,7 +765,6 @@ public class AclTracker extends ActivatableTracker
                 {
                     aclCount = indexBatchOfChangeSets(changeSetBatch);
                     // Update last committed transactions
-                    setLastChangeSetIdAndCommitTimeInTrackerState(changeSetBatch, state);
                     indexAclChangeSetAfterWorker(changeSetBatch, state);
 
                     long endElapsed = System.nanoTime();
@@ -774,6 +773,9 @@ public class AclTracker extends ActivatableTracker
                     totalAclCount += aclCount;
                 }
 
+                // Update state with server data on last transactions processed
+                setLastChangeSetIdAndCommitTimeInTrackerState(aclChangeSets.getAclChangeSets(), state);
+
             }
             catch(InterruptedException | ExecutionException e)
             {