diff --git a/code/search/SearchIndex.php b/code/search/SearchIndex.php
index 47d1e76..7e4ab9a 100644
--- a/code/search/SearchIndex.php
+++ b/code/search/SearchIndex.php
@@ -557,6 +557,10 @@ abstract class SearchIndex extends ViewableData
 
                         $ids = $sql->execute()->column();
                     }
+                    
+                    if (empty($ids)) {
+                        break;
+                    }
                 }
 
                 SearchVariant::activate_state($current);