diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index b8cff64214..a13314ab2f 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -71,12 +71,18 @@ class Base extends Queries
             'array' => false,
         ]);
 
+        $internalId = new Document([
+            'key' => '$internalId',
+            'type' => Database::VAR_STRING,
+            'array' => false,
+        ]);
+
         $validators = [
             new Limit(),
             new Offset(),
             new Cursor(),
             new Filter($attributes, APP_DATABASE_QUERY_MAX_VALUES),
-            new Order($attributes),
+            new Order(array_merge($attributes, [$internalId])),
         ];
 
         parent::__construct($validators);
diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 70f8bea4f2..55cb17b9f8 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -123,7 +123,7 @@ class DatabasesCustomServerTest extends Scope
                 Query::orderDesc()->setAttribute('')->toString(),
             ],
         ]);
-
+        var_dump($databases);
         $this->assertEquals(2, $databases['body']['total']);
         $this->assertEquals($base[0]['$id'], $databases['body']['databases'][0]['$id']);
         $this->assertEquals($base[1]['$id'], $databases['body']['databases'][1]['$id']);