diff --git a/src/khoj/routers/api.py b/src/khoj/routers/api.py
index 18487a59..785b08c0 100644
--- a/src/khoj/routers/api.py
+++ b/src/khoj/routers/api.py
@@ -114,7 +114,7 @@ async def set_processor_conversation_config_data(updated_config: ConversationPro
 
 
 @api.get("/search", response_model=List[SearchResponse])
-def search(
+async def search(
     q: str,
     n: Optional[int] = 5,
     t: Optional[SearchType] = None,
@@ -257,9 +257,9 @@ def search(
 
         # Query across each requested content types in parallel
         with timer("Query took", logger):
-            for search_future in search_futures[t]:
+            for search_future in concurrent.futures.as_completed(search_futures[t]):
                 if t == SearchType.Image:
-                    hits = search_futures.result()
+                    hits = await search_future.result()
                     output_directory = constants.web_directory / "images"
                     # Collate results
                     results += image_search.collate_results(
@@ -270,7 +270,7 @@ def search(
                         count=results_count or 5,
                     )
                 else:
-                    hits, entries = search_future.result()
+                    hits, entries = await search_future.result()
                     # Collate results
                     results += text_search.collate_results(hits, entries, results_count or 5)
 
diff --git a/src/khoj/search_type/text_search.py b/src/khoj/search_type/text_search.py
index c85857bb..14e2015f 100644
--- a/src/khoj/search_type/text_search.py
+++ b/src/khoj/search_type/text_search.py
@@ -102,7 +102,7 @@ def compute_embeddings(
     return corpus_embeddings
 
 
-def query(
+async def query(
     raw_query: str,
     model: TextSearchModel,
     question_embedding: torch.Tensor | None = None,