diff --git a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
index 25f02e8adc..1b7b68cbde 100644
--- a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
@@ -94,9 +94,12 @@ export const EntityTagPicker = (props: EntityTagPickerProps) => {
 
   useEffect(() => {
     updateFilters({
-      tags: selectedTags.length ? new EntityTagFilter(selectedTags) : undefined,
+      tags:
+        selectedTags.length && Object.keys(availableTags ?? {}).length
+          ? new EntityTagFilter(selectedTags)
+          : undefined,
     });
-  }, [selectedTags, updateFilters]);
+  }, [selectedTags, updateFilters, availableTags]);
 
   if (!Object.keys(availableTags ?? {}).length) return null;