diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts
index a671a155d3..404c980128 100644
--- a/packages/catalog-client/src/CatalogClient.ts
+++ b/packages/catalog-client/src/CatalogClient.ts
@@ -249,8 +249,11 @@ export class CatalogClient implements CatalogApi {
       }
       filterPredicate = query;
       if (filter !== undefined) {
-        const converted = convertFilterToPredicate(filter);
-        filterPredicate = { $all: [filterPredicate, converted] };
+        const filterValue = this.getFilterValue(filter);
+        if (filterValue && Object.keys(filterValue).length > 0) {
+          const converted = convertFilterToPredicate(filter);
+          filterPredicate = { $all: [filterPredicate, converted] };
+        }
       }
     }