diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
index 8cd7220ce0..34dba1416f 100644
--- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
+++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
@@ -642,7 +642,9 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
                     }
                 });
             }
-            if (nodeId == lastCached && !toVisit.isEmpty())
+            final boolean nodeIdEqualsLastCached = (nodeId == null && lastCached == null) ||
+                                                    nodeId.equals(lastCached);
+            if (nodeIdEqualsLastCached && !toVisit.isEmpty())
             {
                 nodeDAO.cacheNodesById(toVisit);
                 lastCached = toVisit.peekLast();