diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
index dda24c3639..c19da47feb 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
@@ -95,6 +95,10 @@ export const EntityLifecyclePicker = () => {
     }
   }, [queryParamLifecycles, availableLifecycles]);
 
+  useEffect(() => {
+    if (!availableLifecycles.length) setSelectedLifecycles([]);
+  }, [availableLifecycles]);
+
   if (!availableLifecycles.length) return null;
 
   return (
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
index 3804324619..894b82c92d 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
@@ -99,6 +99,10 @@ export const EntityOwnerPicker = () => {
     }
   }, [queryParamOwners, availableOwners]);
 
+  useEffect(() => {
+    if (!availableOwners.length) setSelectedOwners([]);
+  }, [availableOwners]);
+
   if (!availableOwners.length) return null;
 
   return (