diff --git a/apps/web/src/api/buster_rest/search/queryRequests.ts b/apps/web/src/api/buster_rest/search/queryRequests.ts
index e64c48bc7..1a154c0a4 100644
--- a/apps/web/src/api/buster_rest/search/queryRequests.ts
+++ b/apps/web/src/api/buster_rest/search/queryRequests.ts
@@ -6,15 +6,11 @@ import { search } from './requests';
 
 export const useSearch = <T = SearchTextResponse>(
   params: Parameters<typeof search>[0],
-  options?: Omit<UseQueryOptions<SearchTextResponse, ApiError, T>, 'queryKey' | 'queryFn'>,
-  postQueryOptions?: {
-    doNotUnwrapData?: boolean;
-  }
+  options?: Omit<UseQueryOptions<SearchTextResponse, ApiError, T>, 'queryKey' | 'queryFn'>
 ) => {
-  const { doNotUnwrapData = false } = postQueryOptions || {};
   return useQuery<SearchTextResponse, ApiError, T>({
     ...searchQueryKeys.getSearchResult(params),
-    queryFn: () => search(params),
+    queryFn: ({ signal }) => search(params, signal),
     select: options?.select,
     ...options,
     placeholderData: keepPreviousData,
diff --git a/apps/web/src/api/buster_rest/search/requests.ts b/apps/web/src/api/buster_rest/search/requests.ts
index fe9efb9d4..68ae82fc0 100644
--- a/apps/web/src/api/buster_rest/search/requests.ts
+++ b/apps/web/src/api/buster_rest/search/requests.ts
@@ -1,7 +1,6 @@
 import type { SearchTextRequest, SearchTextResponse } from '@buster/server-shared/search';
-import qs from 'qs';
 import { mainApiV2 } from '../instances';
 
-export const search = async (params: SearchTextRequest) => {
-  return mainApiV2.get<SearchTextResponse>('/search', { params }).then((res) => res.data);
+export const search = async (params: SearchTextRequest, signal?: AbortSignal) => {
+  return mainApiV2.get<SearchTextResponse>('/search', { params, signal }).then((res) => res.data);
 };