diff --git a/webapp/src/components/AssetList/AssetList.tsx b/webapp/src/components/AssetList/AssetList.tsx
index ef56201d04..53bda9a84a 100644
--- a/webapp/src/components/AssetList/AssetList.tsx
+++ b/webapp/src/components/AssetList/AssetList.tsx
@@ -44,7 +44,7 @@ const AssetList = (props: Props) => {
   )
   const maxQuerySize = getMaxQuerySize(vendor)
 
-  const hasMorePages = (assets.length !== count || count === maxQuerySize) && page <= MAX_PAGE
+  const hasMorePages = !isLoading && count !== undefined && (assets.length !== count || count === maxQuerySize) && page <= MAX_PAGE
 
   const emptyStateTranslationString = useMemo(() => {
     if (assets.length > 0) {