diff --git a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
index 1b7b68cbde..4a1dc03e96 100644
--- a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
@@ -93,9 +93,10 @@ export const EntityTagPicker = (props: EntityTagPickerProps) => {
   }, [queryParamTags]);
 
   useEffect(() => {
+    const tags = Object.keys(availableTags ?? {});
     updateFilters({
       tags:
-        selectedTags.length && Object.keys(availableTags ?? {}).length
+        selectedTags.length && tags.length
           ? new EntityTagFilter(selectedTags)
           : undefined,
     });