diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
index f6e6b4eeaa..693c8ab85c 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
@@ -83,17 +83,17 @@ export const EntityLifecyclePicker = () => {
     });
   }, [selectedLifecycles, updateFilters]);
 
-  const availableLifecycles = useMemo(
-    () =>
-      [
-        ...new Set(
-          backendEntities
-            .map((e: Entity) => e.spec?.lifecycle)
-            .filter(Boolean) as string[],
-        ),
-      ].sort(),
-    [backendEntities],
-  );
+  const availableLifecycles = useMemo(() => {
+    const lifecycles = [
+      ...new Set(
+        backendEntities
+          .map((e: Entity) => e.spec?.lifecycle)
+          .filter(Boolean) as string[],
+      ),
+    ].sort();
+    if (lifecycles.length === 0) setSelectedLifecycles([]);
+    return lifecycles;
+  }, [backendEntities]);
 
   if (!availableLifecycles.length) return null;
 
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
index 0a4a79857e..d389ead06a 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
@@ -83,21 +83,21 @@ export const EntityOwnerPicker = () => {
     });
   }, [selectedOwners, updateFilters]);
 
-  const availableOwners = useMemo(
-    () =>
-      [
-        ...new Set(
-          backendEntities
-            .flatMap((e: Entity) =>
-              getEntityRelations(e, RELATION_OWNED_BY).map(o =>
-                humanizeEntityRef(o, { defaultKind: 'group' }),
-              ),
-            )
-            .filter(Boolean) as string[],
-        ),
-      ].sort(),
-    [backendEntities],
-  );
+  const availableOwners = useMemo(() => {
+    const owners = [
+      ...new Set(
+        backendEntities
+          .flatMap((e: Entity) =>
+            getEntityRelations(e, RELATION_OWNED_BY).map(o =>
+              humanizeEntityRef(o, { defaultKind: 'group' }),
+            ),
+          )
+          .filter(Boolean) as string[],
+      ),
+    ].sort();
+    if (owners.length === 0) setSelectedOwners([]);
+    return owners;
+  }, [backendEntities]);
 
   if (!availableOwners.length) return null;