diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index 85fbf43e66..b8cff64214 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -60,13 +60,11 @@ class Base extends Queries
             'type' => Database::VAR_STRING,
             'array' => false,
         ]);
-
         $attributes[] = new Document([
             'key' => '$createdAt',
             'type' => Database::VAR_DATETIME,
             'array' => false,
         ]);
-
         $attributes[] = new Document([
             'key' => '$updatedAt',
             'type' => Database::VAR_DATETIME,
@@ -78,15 +76,8 @@ class Base extends Queries
             new Offset(),
             new Cursor(),
             new Filter($attributes, APP_DATABASE_QUERY_MAX_VALUES),
-            new Order(
-                array_merge($attributes, [
-                    new Document([
-                        'key' => '$internalId',
-                        'type' => Database::VAR_STRING,
-                        'array' => false,
-                    ])
-                ])
-            )];
+            new Order($attributes),
+        ];
 
         parent::__construct($validators);
     }
diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 57e0b93634..70f8bea4f2 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -120,7 +120,7 @@ class DatabasesCustomServerTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'queries' => [
-                Query::orderDesc()->toString(),
+                Query::orderDesc()->setAttribute('')->toString(),
             ],
         ]);
 
@@ -453,7 +453,7 @@ class DatabasesCustomServerTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'queries' => [
-                Query::orderDesc()->toString(),
+                Query::orderDesc()->setAttribute('')->toString(),
             ],
         ]);