diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index dab605d176..a9d706582a 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -686,9 +686,10 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
       })
       .groupBy(['search.key', 'search.original_value']);
 
-    if (request.filter) {
+    if (request.filter || request.query) {
       applyEntityFilterToQuery({
         filter: request.filter,
+        query: request.query,
         targetQuery: query,
         onEntityIdField: 'search.entity_id',
         knex: this.database,