diff --git a/packages/fl_query/lib/src/core/infinite_query.dart b/packages/fl_query/lib/src/core/infinite_query.dart index aa89767..adbbac7 100644 --- a/packages/fl_query/lib/src/core/infinite_query.dart +++ b/packages/fl_query/lib/src/core/infinite_query.dart @@ -75,8 +75,16 @@ class InfiniteQueryState { required this.pages, }); - PageType get lastPage => - pages.whereNot((e) => e.data == null && e.error == null).last.page; + PageType get lastPage { + final fetchedPages = + pages.whereNot((e) => e.data == null && e.error == null); + + if (fetchedPages.isEmpty && pages.length == 1) { + return pages.last.page; + } + + return fetchedPages.last.page; + } InfiniteQueryState copyWith( {Set>? pages}) {