diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
index 69d35fbc6a..0c1a9ff588 100644
--- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
+++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
@@ -560,7 +560,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
         Long lastCached = toVisit.peekLast();
         while ((nodeId = toVisit.pollFirst()) != null)
         {
-            if (visited.add(nodeId))
+            if (visited.add(nodeId) && (nodeDAO.getNodeIdStatus(nodeId) != null) && (false == nodeDAO.getNodeIdStatus(nodeId).isDeleted()))
             {
                 nodeDAO.getParentAssocs(nodeId, null, null, null, new ChildAssocRefQueryCallback()
                 {