diff --git a/swh/storage/cassandra/storage.py b/swh/storage/cassandra/storage.py
--- a/swh/storage/cassandra/storage.py
+++ b/swh/storage/cassandra/storage.py
@@ -857,13 +857,8 @@
 
         assert len(visits) <= extra_limit
         if len(visits) == extra_limit:
-            last_visit = visits[limit]
             visits = visits[:limit]
-            assert last_visit is not None and last_visit.visit is not None
-            if order == ListOrder.ASC:
-                next_page_token = str(last_visit.visit - 1)
-            else:
-                next_page_token = str(last_visit.visit + 1)
+            next_page_token = str(visits[-1].visit)
 
         return PagedResult(results=visits, next_page_token=next_page_token)
 
diff --git a/swh/storage/in_memory.py b/swh/storage/in_memory.py
--- a/swh/storage/in_memory.py
+++ b/swh/storage/in_memory.py
@@ -888,13 +888,8 @@
 
         assert len(visits) <= extra_limit
         if len(visits) == extra_limit:
-            last_visit = visits[limit]
             visits = visits[:limit]
-            assert last_visit is not None and last_visit.visit is not None
-            if order == ListOrder.ASC:
-                next_page_token = str(last_visit.visit - 1)
-            else:
-                next_page_token = str(last_visit.visit + 1)
+            next_page_token = str(visits[-1].visit)
 
         return PagedResult(results=visits, next_page_token=next_page_token)
 
diff --git a/swh/storage/storage.py b/swh/storage/storage.py
--- a/swh/storage/storage.py
+++ b/swh/storage/storage.py
@@ -906,13 +906,8 @@
         assert len(visits) <= extra_limit
 
         if len(visits) == extra_limit:
-            last_visit = visits[limit]
             visits = visits[:limit]
-            assert last_visit is not None and last_visit.visit is not None
-            if order == ListOrder.ASC:
-                next_page_token = str(last_visit.visit - 1)
-            else:
-                next_page_token = str(last_visit.visit + 1)
+            next_page_token = str(visits[-1].visit)
 
         return PagedResult(results=visits, next_page_token=next_page_token)