diff --git a/composer.json b/composer.json
index d3a125d305..23dfe15936 100644
--- a/composer.json
+++ b/composer.json
@@ -58,6 +58,7 @@
         "utopia-php/logger": "0.3.*",
         "utopia-php/messaging": "0.1.*",
         "utopia-php/orchestration": "0.6.*",
+        "utopia-php/preloader": "0.2.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "0.13.*",
         "utopia-php/swoole": "0.5.*",
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Limit.php b/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
index 232df93666..7a99825bcd 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
@@ -15,7 +15,7 @@ class Limit extends Base
      *
      * @param int $maxLimit
      */
-    public function __construct(int $maxLimit = 100)
+    public function __construct(int $maxLimit = PHP_INT_MAX)
     {
         $this->maxLimit = $maxLimit;
     }
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Offset.php b/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
index 9f832a7c62..0bcbb909fa 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
@@ -2,7 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Query;
 
-use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Database\Query;
 use Utopia\Validator\Range;
 
@@ -15,7 +14,7 @@ class Offset extends Base
      *
      * @param int $maxOffset
      */
-    public function __construct(int $maxOffset = 5000)
+    public function __construct(int $maxOffset = PHP_INT_MAX)
     {
         $this->maxOffset = $maxOffset;
     }
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index b12aa27831..9f14c59306 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -1080,15 +1080,6 @@ trait UsersBase
 
         $this->assertEquals($response['headers']['status-code'], 400);
 
-        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'queries' => ['limit(101)']
-        ]);
-
-        $this->assertEquals($response['headers']['status-code'], 400);
-
         $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1098,15 +1089,6 @@ trait UsersBase
 
         $this->assertEquals($response['headers']['status-code'], 400);
 
-        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'queries' => ['offset(5001)']
-        ]);
-
-        $this->assertEquals($response['headers']['status-code'], 400);
-
         $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],