diff --git a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
index 7f2934e74e..7972ef300f 100644
--- a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
@@ -97,7 +97,10 @@ public class ResultMapper
 
         if (jsonResultSet != null)
         {
-            context = new SearchContext(jsonResultSet.getLastIndexedTxId());
+            if (jsonResultSet.getLastIndexedTxId() > 0)
+            {
+                context = new SearchContext(jsonResultSet.getLastIndexedTxId());
+            }
         }
 
         return CollectionWithPagingInfo.asPaged(searchQuery.getPaging(), noderesults, noderesults.size() + skip < total, total, null, context);