diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index a55323941f..cfa708610d 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1615,6 +1615,8 @@ class SearchService {
           }
         }
         round++;
+        // Extra safety to prevent infinite loops
+        if (round > safeCount) break;
       }
     }