diff --git a/mobile/lib/services/machine_learning/semantic_search/embedding_store.dart b/mobile/lib/services/machine_learning/semantic_search/embedding_store.dart
index 420b8c97f..485e1f2c9 100644
--- a/mobile/lib/services/machine_learning/semantic_search/embedding_store.dart
+++ b/mobile/lib/services/machine_learning/semantic_search/embedding_store.dart
@@ -145,9 +145,12 @@ class EmbeddingStore {
     }
 
     _logger.info("${remoteEmbeddings.length} embeddings fetched");
+
     return RemoteEmbeddings(
       remoteEmbeddings,
-      remoteEmbeddings.length == limit,
+      // keep fetching until we get all embeddings. Avoid limit check as
+      // some embedding fetch might fail on server
+      remoteEmbeddings.isNotEmpty,
     );
   }