diff --git a/src/main/java/org/roboswag/components/listing/PagingListProvider.java b/src/main/java/org/roboswag/components/listing/PagingListProvider.java
index 899303e..f6593d6 100644
--- a/src/main/java/org/roboswag/components/listing/PagingListProvider.java
+++ b/src/main/java/org/roboswag/components/listing/PagingListProvider.java
@@ -114,7 +114,10 @@ public class PagingListProvider<T> implements ItemsProvider<T> {
                         }
 
                         maxLoadedPage = (index - 1) / PAGE_SIZE;
-                        if (!pageToAdd.isEmpty()) {
+                        if (pageToAdd.isEmpty() && index == 0) {
+                            maxLoadedPage = null;
+                            isLastPageLoaded = true;
+                        } else if (!pageToAdd.isEmpty()) {
                             loadedPages.put(maxLoadedPage, pageToAdd);
                             isLastPageLoaded = pageToAdd.size() < PAGE_SIZE;
                         } else {