diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index d2b69a0329314e4ec270eedc2fde017dab47cb3b..bd114de216a0a30b3271b56c2b627439a7e70a0e 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -721,7 +721,12 @@ impl SemanticIndex {
             )?;
 
             let batch_n = cx.background().num_cpus();
-            let batch_size = file_ids.clone().len() / batch_n;
+            let ids_len = file_ids.clone().len();
+            let batch_size = if ids_len <= batch_n {
+                ids_len
+            } else {
+                ids_len / batch_n
+            };
 
             let mut result_tasks = Vec::new();
             for batch in file_ids.chunks(batch_size) {