diff --git a/src/products/views/ProductList/useSortRedirects.ts b/src/products/views/ProductList/useSortRedirects.ts
index b1682a04e..24bc3dafe 100644
--- a/src/products/views/ProductList/useSortRedirects.ts
+++ b/src/products/views/ProductList/useSortRedirects.ts
@@ -14,6 +14,8 @@ export function useSortRedirects(
 ) {
   const navigate = useNavigator();
 
+  const hasQuery = !!params.query?.trim();
+
   useEffect(() => {
     const sortWithQuery = ProductListUrlSortField.rank;
     const sortWithoutQuery =
@@ -23,8 +25,8 @@ export function useSortRedirects(
     navigate(
       productListUrl({
         ...params,
-        asc: params.query ? false : params.asc,
-        sort: params.query ? sortWithQuery : sortWithoutQuery
+        asc: hasQuery ? false : params.asc,
+        sort: hasQuery ? sortWithQuery : sortWithoutQuery
       })
     );
   }, [params.query]);
diff --git a/src/utils/handlers/filterHandlers.ts b/src/utils/handlers/filterHandlers.ts
index d108fa9d8..b46686d28 100644
--- a/src/utils/handlers/filterHandlers.ts
+++ b/src/utils/handlers/filterHandlers.ts
@@ -62,7 +62,7 @@ function createFilterHandlers<
         after: undefined,
         before: undefined,
         activeTab: undefined,
-        query
+        query: query?.trim()
       })
     );
   };