diff --git a/includes/datasource_entity.inc b/includes/datasource_entity.inc
index b8433b8..3ebbab2 100644
--- a/includes/datasource_entity.inc
+++ b/includes/datasource_entity.inc
@@ -186,14 +186,17 @@ public function startTracking(array $indexes) {
                 $bundles = db_query('SELECT nid FROM {node} WHERE type IN (:bundles)', array(':bundles' => $node_types))->fetchCol();
               }
               else {
-                return;
+                continue;
               }
             }
             else {
               $this->startTrackingFallback(array($index->machine_name => $index));
+              continue;
             }
           }
-          $query->condition($bundle_column, $bundles);
+          if ($bundles) {
+            $query->condition($bundle_column, $bundles);
+          }
         }
 
         // INSERT ... SELECT ...