diff --git a/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.test.ts b/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.test.ts
index 4bc6acc37da..be693bde495 100644
--- a/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.test.ts
+++ b/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.test.ts
@@ -29,6 +29,8 @@ describe('#buildCategoryFacetSearchRequest', () => {
     query = 'test';
     state = buildMockCommerceState();
 
+    state.commerceQuery.query = 'test query';
+
     state.categoryFacetSearchSet[facetId] = buildMockCategoryFacetSearch({
       options: {...buildMockFacetSearchRequestOptions(), query},
     });
@@ -186,7 +188,7 @@ describe('#buildCategoryFacetSearchRequest', () => {
       facetId,
       facetQuery: `*${query}*`,
       ignorePaths: [],
-      query: state.commerceQuery?.query,
+      query: 'test query',
     });
   });
 
@@ -206,7 +208,7 @@ describe('#buildCategoryFacetSearchRequest', () => {
       facetId,
       facetQuery: `*${query}*`,
       ignorePaths: [],
-      query: '',
+      query: 'test query',
     });
   });
 });
diff --git a/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.ts b/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.ts
index bd1ffa5b923..1d184b7fcf9 100644
--- a/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.ts
+++ b/packages/headless/src/features/commerce/facets/facet-search-set/category/commerce-category-facet-search-request-builder.ts
@@ -54,7 +54,7 @@ export const buildCategoryFacetSearchRequest = (
     clientId,
     context,
     query,
-    ...(!isFieldSuggestionsRequest && {...restOfCommerceAPIRequest, query: ''}),
+    ...(!isFieldSuggestionsRequest && {...restOfCommerceAPIRequest}),
   };
 };
 
diff --git a/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.test.ts b/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.test.ts
index 73bfe3f9916..be1dd4a9e81 100644
--- a/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.test.ts
+++ b/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.test.ts
@@ -21,6 +21,7 @@ describe('#buildFacetSearchRequest', () => {
     facetId = '1';
     query = 'test';
     state = buildMockCommerceState();
+    state.commerceQuery.query = 'test query';
     state.facetSearchSet[facetId] = buildMockFacetSearch({
       options: {...buildMockFacetSearchRequestOptions(), query},
     });
@@ -71,7 +72,7 @@ describe('#buildFacetSearchRequest', () => {
       ...buildCommerceAPIRequestMock.mock.results[0].value,
       facetId,
       facetQuery: `*${query}*`,
-      query: state.commerceQuery?.query,
+      query: 'test query',
     });
   });
 
@@ -89,7 +90,7 @@ describe('#buildFacetSearchRequest', () => {
     expect(request).toEqual({
       ...expectedBaseRequest,
       facetId,
-      query: '',
+      query: 'test query',
       facetQuery: `*${query}*`,
     });
   });
diff --git a/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.ts b/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.ts
index ce5dda6d0c4..eee69708c73 100644
--- a/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.ts
+++ b/packages/headless/src/features/commerce/facets/facet-search-set/regular/commerce-regular-facet-search-request-builder.ts
@@ -40,6 +40,6 @@ export const buildFacetSearchRequest = (
     clientId,
     context,
     query,
-    ...(!isFieldSuggestionsRequest && {...restOfCommerceAPIRequest, query: ''}),
+    ...(!isFieldSuggestionsRequest && {...restOfCommerceAPIRequest}),
   };
 };