diff --git a/src/clients/pagination/iter.rs b/src/clients/pagination/iter.rs
index fc9bf27a..692e06a3 100644
--- a/src/clients/pagination/iter.rs
+++ b/src/clients/pagination/iter.rs
@@ -52,13 +52,17 @@ where
         }
 
         match (self.req)(self.page_size, self.offset) {
-            Ok(page) if page.items.is_empty() => {
-                self.done = true;
-                None
-            }
             Ok(page) => {
-                self.offset += page.items.len() as u32;
-                Some(Ok(page))
+                if page.next.is_none() {
+                    self.done = true;
+                }
+
+                if page.items.is_empty() {
+                    None
+                } else {
+                    self.offset += page.items.len() as u32;
+                    Some(Ok(page))
+                }
             }
             Err(e) => Some(Err(e)),
         }