From 228f4db4fa541a4a070f8c805ac624f8ca7807d6 Mon Sep 17 00:00:00 2001
From: Sarah Medeiros <smedeiros@wayfair.com>
Date: Thu, 15 Dec 2022 15:57:57 -0500
Subject: [PATCH] Fix tag filter bug

Signed-off-by: Sarah Medeiros <smedeiros@wayfair.com>
---
 .../src/components/EntityTagPicker/EntityTagPicker.tsx     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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;