diff --git a/swh/indexer/storage/__init__.py b/swh/indexer/storage/__init__.py
--- a/swh/indexer/storage/__init__.py
+++ b/swh/indexer/storage/__init__.py
@@ -799,7 +799,7 @@
         Returns:
             dict: dict with the following keys:
               - **next_page_token** (str, optional): opaque token to be used as
-                `page_token` for retrieveing the next page. If absent, there is
+                `page_token` for retrieving the next page. If absent, there is
                 no more pages to gather.
               - **origins** (list): list of origin url (str) if `ids_only=True`
                 else dictionaries with the following keys:
@@ -822,14 +822,14 @@
         if ids_only:
             result['origins'] = [origin for (origin,) in res]
             if len(result['origins']) > limit:
-                result['origins'] = result['origins'][:limit]
-                result['next_page_token'] = result['origins'][-1]
+                result['next_page_token'] = result['origins'][limit]
+                result['origins'][limit:] = []
         else:
             result['origins'] = [converters.db_to_metadata(
                 dict(zip(db.origin_intrinsic_metadata_cols, c)))for c in res]
             if len(result['origins']) > limit:
-                result['origins'] = result['origins'][:limit]
                 result['next_page_token'] = result['origins'][-1]['id']
+                result['origins'][limit:] = []
         return result
 
     @remote_api_endpoint('origin_intrinsic_metadata/stats')
diff --git a/swh/indexer/tests/storage/test_storage.py b/swh/indexer/tests/storage/test_storage.py
--- a/swh/indexer/tests/storage/test_storage.py
+++ b/swh/indexer/tests/storage/test_storage.py
@@ -1639,7 +1639,7 @@
         result = endpoint(page_token=data.origin_url_1[:-1],
                           limit=2, ids_only=True)
         assert result['origins'] == [data.origin_url_1, data.origin_url_2]
-        assert result['next_page_token'] == result['origins'][-1]
+        assert result['next_page_token'] == str(result['origins'][-1])
 
         result = endpoint(page_token=data.origin_url_1, limit=2, ids_only=True)
         assert result['origins'] == [data.origin_url_2, data.origin_url_3]
@@ -1673,7 +1673,7 @@
         # test pagination + mappings
         result = endpoint(mappings=['npm'], limit=1, ids_only=True)
         assert result['origins'] == [data.origin_url_1]
-        assert result['next_page_token'] == result['origins'][-1]
+        assert result['next_page_token'] == str(result['origins'][-1])
 
         # test tool filtering
         result = endpoint(tool_ids=[tool1['id']], ids_only=True)