diff --git a/astra/src/main/java/com/slack/astra/logstore/search/LogIndexSearcherImpl.java b/astra/src/main/java/com/slack/astra/logstore/search/LogIndexSearcherImpl.java
index 4384e2bf32..e8c2b579db 100644
--- a/astra/src/main/java/com/slack/astra/logstore/search/LogIndexSearcherImpl.java
+++ b/astra/src/main/java/com/slack/astra/logstore/search/LogIndexSearcherImpl.java
@@ -111,13 +111,12 @@ public SearchResult<LogMessage> search(
       // Acquire an index searcher from searcher manager.
       // This is a useful optimization for indexes that are static.
       IndexSearcher searcher = searcherManager.acquire();
-
-      Query query =
-          openSearchAdapter.buildQuery(
-              dataset, queryStr, startTimeMsEpoch, endTimeMsEpoch, searcher);
       try {
         List<LogMessage> results;
         InternalAggregation internalAggregation = null;
+        Query query =
+            openSearchAdapter.buildQuery(
+                dataset, queryStr, startTimeMsEpoch, endTimeMsEpoch, searcher);
 
         if (howMany > 0) {
           CollectorManager<TopFieldCollector, TopFieldDocs> topFieldCollector =