diff --git a/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.ts b/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.ts index 13217c6800..ba971b088d 100644 --- a/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.ts +++ b/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.ts @@ -36,6 +36,11 @@ export function useAllEntitiesCount() { limit: 0, }; + if (Object.keys(filter).length === 0) { + prevRequest.current = undefined; + return prevRequest.current; + } + if (isEqual(newRequest, prevRequest.current)) { return prevRequest.current; } @@ -44,6 +49,9 @@ export function useAllEntitiesCount() { }, [filters]); const { value: count, loading } = useAsync(async () => { + if (request === undefined) { + return 0; + } const { totalItems } = await catalogApi.queryEntities(request); return totalItems;