diff --git a/plugins/NinjaOne/v1/dataStreams/devices.json b/plugins/NinjaOne/v1/dataStreams/devices.json
index 745737a..00c7f1f 100644
--- a/plugins/NinjaOne/v1/dataStreams/devices.json
+++ b/plugins/NinjaOne/v1/dataStreams/devices.json
@@ -6,26 +6,18 @@
     "config": {
         "httpMethod": "get",
         "paging": {
-            "mode": "token",
-            "pageSize": {
-                "realm": "queryArg",
-                "path": "pageSize",
-                "value": "1000"
-            },
-            "in": {
-                "realm": "payload",
-                "path": "metadata.next_page_token"
-            },
-            "out": {
-                "realm": "queryArg",
-                "path": "after"
-            }
+            "mode": "none"
         },
         "expandInnerObjects": true,
         "endpointPath": "/v2/devices",
         "postRequestScript": "devices.js",
         "pathToData": "",
-        "getArgs": [],
+        "getArgs": [
+            {
+                "key": "pageSize",
+                "value": "10000"
+            }
+        ],
         "headers": []
     },
     "metadata": [
diff --git a/plugins/NinjaOne/v1/dataStreams/locationDevices.json b/plugins/NinjaOne/v1/dataStreams/locationDevices.json
index a790a4f..541ab4c 100644
--- a/plugins/NinjaOne/v1/dataStreams/locationDevices.json
+++ b/plugins/NinjaOne/v1/dataStreams/locationDevices.json
@@ -7,26 +7,18 @@
     "config": {
         "httpMethod": "get",
         "paging": {
-            "mode": "token",
-            "pageSize": {
-                "realm": "queryArg",
-                "path": "pageSize",
-                "value": "1000"
-            },
-            "in": {
-                "realm": "payload",
-                "path": "metadata.next_page_token"
-            },
-            "out": {
-                "realm": "queryArg",
-                "path": "after"
-            }
+            "mode": "none"
         },
         "expandInnerObjects": true,
         "endpointPath": "/v2/devices",
         "postRequestScript": "locationDevices.js",
         "pathToData": "",
-        "getArgs": [],
+        "getArgs": [
+            {
+                "key": "pageSize",
+                "value": "10000"
+            }
+        ],
         "headers": []
     },
     "matches": {
diff --git a/plugins/NinjaOne/v1/dataStreams/locations.json b/plugins/NinjaOne/v1/dataStreams/locations.json
index 4557794..84b17a8 100644
--- a/plugins/NinjaOne/v1/dataStreams/locations.json
+++ b/plugins/NinjaOne/v1/dataStreams/locations.json
@@ -7,26 +7,18 @@
     "config": {
         "httpMethod": "get",
         "paging": {
-            "mode": "token",
-            "pageSize": {
-                "realm": "queryArg",
-                "path": "pageSize",
-                "value": "1000"
-            },
-            "in": {
-                "realm": "payload",
-                "path": "metadata.next_page_token"
-            },
-            "out": {
-                "realm": "queryArg",
-                "path": "after"
-            }
+            "mode": "none"
         },
         "expandInnerObjects": true,
         "endpointPath": "/v2/locations",
         "postRequestScript": "locations.js",
         "pathToData": "",
-        "getArgs": [],
+        "getArgs": [
+            {
+                "key": "pageSize",
+                "value": "10000"
+            }
+        ],
         "headers": []
     },
     "metadata": [
diff --git a/plugins/NinjaOne/v1/dataStreams/organizationDevices.json b/plugins/NinjaOne/v1/dataStreams/organizationDevices.json
index 3c918fd..06c2c0e 100644
--- a/plugins/NinjaOne/v1/dataStreams/organizationDevices.json
+++ b/plugins/NinjaOne/v1/dataStreams/organizationDevices.json
@@ -7,26 +7,18 @@
     "config": {
         "httpMethod": "get",
         "paging": {
-            "mode": "token",
-            "pageSize": {
-                "realm": "queryArg",
-                "path": "pageSize",
-                "value": "1000"
-            },
-            "in": {
-                "realm": "payload",
-                "path": "metadata.next_page_token"
-            },
-            "out": {
-                "realm": "queryArg",
-                "path": "after"
-            }
+            "mode": "none"
         },
         "expandInnerObjects": true,
         "endpointPath": "/v2/organization/{{objects[0].organizationId}}/devices",
         "postRequestScript": "devices.js",
         "pathToData": "",
-        "getArgs": [],
+        "getArgs": [
+            {
+                "key": "pageSize",
+                "value": "10000"
+            }
+        ],
         "headers": []
     },
     "objectLimit": 1,
diff --git a/plugins/NinjaOne/v1/dataStreams/organizationLocations.json b/plugins/NinjaOne/v1/dataStreams/organizationLocations.json
index 91ff285..c83b9b6 100644
--- a/plugins/NinjaOne/v1/dataStreams/organizationLocations.json
+++ b/plugins/NinjaOne/v1/dataStreams/organizationLocations.json
@@ -7,26 +7,18 @@
     "config": {
         "httpMethod": "get",
         "paging": {
-            "mode": "token",
-            "pageSize": {
-                "realm": "queryArg",
-                "path": "pageSize",
-                "value": "1000"
-            },
-            "in": {
-                "realm": "payload",
-                "path": "metadata.next_page_token"
-            },
-            "out": {
-                "realm": "queryArg",
-                "path": "after"
-            }
+            "mode": "none"
         },
         "expandInnerObjects": true,
         "endpointPath": "/v2/locations",
         "postRequestScript": "organizationLocations.js",
         "pathToData": "",
-        "getArgs": [],
+        "getArgs": [
+            {
+                "key": "pageSize",
+                "value": "10000"
+            }
+        ],
         "headers": []
     },
     "matches": {
diff --git a/plugins/NinjaOne/v1/dataStreams/organizations.json b/plugins/NinjaOne/v1/dataStreams/organizations.json
index 5eedd54..2334660 100644
--- a/plugins/NinjaOne/v1/dataStreams/organizations.json
+++ b/plugins/NinjaOne/v1/dataStreams/organizations.json
@@ -6,26 +6,18 @@
     "config": {
         "httpMethod": "get",
         "paging": {
-            "mode": "token",
-            "pageSize": {
-                "realm": "queryArg",
-                "path": "pageSize",
-                "value": "1000"
-            },
-            "in": {
-                "realm": "payload",
-                "path": "metadata.next_page_token"
-            },
-            "out": {
-                "realm": "queryArg",
-                "path": "after"
-            }
+            "mode": "none"
         },
         "expandInnerObjects": true,
         "endpointPath": "/v2/organizations",
         "postRequestScript": "organizations.js",
         "pathToData": "",
-        "getArgs": [],
+        "getArgs": [
+            {
+                "key": "pageSize",
+                "value": "10000"
+            }
+        ],
         "headers": []
     },
     "metadata": [