diff --git a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
index eafa10696c..ddb70c6d31 100644
--- a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
@@ -58,10 +58,11 @@ export const EntityTagPicker = () => {
     const facet = 'metadata.tags';
     const { facets } = await catalogApi.getEntityFacets({
       facets: [facet],
+      filter: filters.kind?.getCatalogFilters(),
     });
 
     return facets[facet].map(({ value }) => value);
-  }, []);
+  }, [filters.kind]);
 
   const queryParamTags = useMemo(
     () => [queryParameters.tags].flat().filter(Boolean) as string[],