diff --git a/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java b/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java
index db0b1bd5..1e2530b8 100644
--- a/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java
+++ b/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java
@@ -18,6 +18,11 @@ public boolean hasNext() {
             if (rollingCollection.hasNextPage()) {
                 rollingCollection = rollingCollection.nextPage();
                 pos = 0;
+
+                if (rollingCollection.getPage().size() == 0) {
+                    // if new page is empty
+                    return false;
+                }
                 return true;
             } else {
                 return false;