diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index efb07a459e..3eff0c36bf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -173,6 +173,9 @@ Fixed
 
 Added
 ~~~~~
+* Add support for `limit` and `offset` parameters in sensor wrapper `list_items()`
+  method to make congruent with regular datastore method. #5913
+
 * Move `git clone` to `user_home/.st2packs` #5845
 
 * Error on `st2ctl status` when running in Kubernetes. #5851
diff --git a/st2common/st2common/openapi.yaml b/st2common/st2common/openapi.yaml
index 93d4bcdec6..a1f6385872 100644
--- a/st2common/st2common/openapi.yaml
+++ b/st2common/st2common/openapi.yaml
@@ -1753,7 +1753,7 @@ paths:
           in: query
           description: Number of packs to get
           type: integer
-          default: 100
+          default: 500
         - name: offset
           in: query
           description: Number of packs to offset
@@ -3870,7 +3870,7 @@ paths:
           in: query
           description: Number of trigger types to get
           type: integer
-          default: 100
+          default: 500
         - name: offset
           in: query
           description: Number of trigger types to offset
diff --git a/st2common/st2common/openapi.yaml.j2 b/st2common/st2common/openapi.yaml.j2
index 6b10362640..29f5c5845d 100644
--- a/st2common/st2common/openapi.yaml.j2
+++ b/st2common/st2common/openapi.yaml.j2
@@ -1749,7 +1749,7 @@ paths:
           in: query
           description: Number of packs to get
           type: integer
-          default: 100
+          default: 500
         - name: offset
           in: query
           description: Number of packs to offset
@@ -3866,7 +3866,7 @@ paths:
           in: query
           description: Number of trigger types to get
           type: integer
-          default: 100
+          default: 500
         - name: offset
           in: query
           description: Number of trigger types to offset
diff --git a/st2reactor/st2reactor/container/sensor_wrapper.py b/st2reactor/st2reactor/container/sensor_wrapper.py
index cc4723043a..2de8470d34 100644
--- a/st2reactor/st2reactor/container/sensor_wrapper.py
+++ b/st2reactor/st2reactor/container/sensor_wrapper.py
@@ -141,7 +141,7 @@ def dispatch_with_context(self, trigger, payload=None, trace_context=None):
     # Methods for datastore management
     ##################################
 
-    def list_values(self, local=True, prefix=None, limit=None, offset=None):
+    def list_values(self, local=True, prefix=None, limit=None, offset=0):
         return self.datastore_service.list_values(
             local=local, prefix=prefix, limit=limit, offset=offset
         )