diff --git a/src/components/Projects/hooks/useInfiniteProjectsScroll.ts b/src/components/Projects/hooks/useInfiniteProjectsScroll.ts index aeb812fc7..461940e8c 100644 --- a/src/components/Projects/hooks/useInfiniteProjectsScroll.ts +++ b/src/components/Projects/hooks/useInfiniteProjectsScroll.ts @@ -51,10 +51,12 @@ const useInfiniteProjectsScroll = ( { params: newInputParams, enabled }: object /* eslint-disable consistent-return */ { getNextPageParam: lastPage => { - if ( !lastPage || lastPage.results.length < ITEMS_PER_PAGE ) { - return undefined; - } - return lastPage.page + 1; + if ( !lastPage ) return undefined; + const totalProjectCount = lastPage.total_results; + const totalFetchedCount = lastPage.page * ITEMS_PER_PAGE; + return totalFetchedCount < totalProjectCount + ? lastPage.page + 1 + : undefined; }, enabled }