diff --git a/src/orb/pagination.py b/src/orb/pagination.py
index df68690f..61cc363c 100644
--- a/src/orb/pagination.py
+++ b/src/orb/pagination.py
@@ -32,7 +32,8 @@ def _get_page_items(self) -> List[_T]:
     def next_page_info(self) -> Optional[PageInfo]:
         next_cursor = None
         if self.pagination_metadata is not None:  # pyright: ignore[reportUnnecessaryComparison]
-            next_cursor = self.pagination_metadata.next_cursor
+            if self.pagination_metadata.next_cursor is not None:
+                next_cursor = self.pagination_metadata.next_cursor
         if not next_cursor:
             return None
 
@@ -54,7 +55,8 @@ def _get_page_items(self) -> List[_T]:
     def next_page_info(self) -> Optional[PageInfo]:
         next_cursor = None
         if self.pagination_metadata is not None:  # pyright: ignore[reportUnnecessaryComparison]
-            next_cursor = self.pagination_metadata.next_cursor
+            if self.pagination_metadata.next_cursor is not None:
+                next_cursor = self.pagination_metadata.next_cursor
         if not next_cursor:
             return None