diff --git a/tiled/catalog/adapter.py b/tiled/catalog/adapter.py
index 81b16996d..f6e26a3aa 100644
--- a/tiled/catalog/adapter.py
+++ b/tiled/catalog/adapter.py
@@ -760,7 +760,7 @@ class CatalogContainerAdapter(CatalogNodeAdapter):
     async def keys_range(self, offset, limit):
         if self.data_sources:
             return (await self.get_adapter()).keys()[
-                offset : offset + limit  # noqa: E203
+                offset : (offset + limit) if limit is not None else None  # noqa: E203
             ]
         statement = select(orm.Node.key).filter(orm.Node.ancestors == self.segments)
         for condition in self.conditions:
@@ -781,7 +781,7 @@ async def keys_range(self, offset, limit):
     async def items_range(self, offset, limit):
         if self.data_sources:
             return (await self.get_adapter()).items()[
-                offset : offset + limit  # noqa: E203
+                offset : (offset + limit) if limit is not None else None  # noqa: E203
             ]
         statement = select(orm.Node).filter(orm.Node.ancestors == self.segments)
         for condition in self.conditions: