diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java
index 3862ebd30..7c0df7841 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java
@@ -546,6 +546,17 @@ public class MetadataTracker extends CoreStatePublisher implements Tracker
         {
             transactions = client.getTransactions(startTime, null, startTime + actualTimeStep, null, maxResults, shardstate);
             startTime += actualTimeStep;
+            
+            // If no transactions are found, advance the time window to the next available transaction commit time
+            if (transactions.getTransactions().size() == 0)
+            {
+                Long nextTxCommitTime = client.getNextTxCommitTime(coreName, startTime);
+                if (nextTxCommitTime != -1)
+                {
+                    log.info("Advancing transactions from startTime = " + startTime + " to " + nextTxCommitTime);
+                    transactions = client.getTransactions(nextTxCommitTime, null, nextTxCommitTime + actualTimeStep, null, maxResults, shardstate);
+                }
+            }
 
         } while (((transactions.getTransactions().size() == 0) && (startTime < endTime))
                     || ((transactions.getTransactions().size() > 0) && alreadyFoundTransactions(txnsFound, transactions)));
diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java
index 136d5ddde..2be8197e1 100644
--- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java
+++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java
@@ -103,7 +103,8 @@ public class SOLRAPIClient
     private static final String GET_NODES_URL = "api/solr/nodes";
     private static final String GET_CONTENT = "api/solr/textContent";
     private static final String GET_MODEL = "api/solr/model";
-    private static final String GET_MODELS_DIFF = "api/solr/modelsdiff";
+    private static final String GET_MODELS_DIFF = "api/solr/modelsdiff";
+    private static final String GET_NEXT_TX_COMMIT_TIME = "api/solr/nextTransaction";
 
     private static final String CHECKSUM_HEADER = "XAlfresco-modelChecksum";
 
@@ -1228,7 +1229,51 @@ public class SOLRAPIClient
         }
 
         return diffs;
-    }
+    }
+    
+    /**
+     * Returns the minimum and the maximum commit time for transactions in a node id range.
+     * 
+     * @param coreName alfresco, archive
+     * @param fromCommitTime initial transaction commit time
+     * @return Time of the next transaction
+     * @throws IOException 
+     * @throws AuthenticationException 
+     * @throws Exception
+     */
+    public Long getNextTxCommitTime(String coreName, Long fromCommitTime) throws AuthenticationException, IOException
+    {
+        StringBuilder url = new StringBuilder(GET_NEXT_TX_COMMIT_TIME);
+        url.append("?").append("fromCommitTime").append("=").append(fromCommitTime);
+        GetRequest get = new GetRequest(url.toString());
+        Response response = null;
+        JSONObject json = null;
+        try
+        {
+            response = repositoryHttpClient.sendRequest(get);
+            if (response.getStatus() != HttpStatus.SC_OK)
+            {
+                throw new AlfrescoRuntimeException(coreName + " - GetNextTxCommitTime return status is "
+                        + response.getStatus() + " when invoking " + url);
+            }
+
+            Reader reader = new BufferedReader(new InputStreamReader(response.getContentAsStream(), "UTF-8"));
+            json = new JSONObject(new JSONTokener(reader));
+        }
+        finally
+        {
+            if (response != null)
+            {
+                response.release();
+            }
+        }
+        if (log.isDebugEnabled())
+        {
+            log.debug(json.toString());
+        }
+
+        return Long.parseLong(json.get("nextTransactionCommitTimeMs").toString());
+    }    
 
     /*
      * type conversions from serialized JSON values to SOLR-consumable objects