diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index e79490eb30..f4da87d300 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -89,13 +89,6 @@ class Base extends Types
             ]);
 
             $this->collection->setAttribute('attributes', $attr, Document::SET_TYPE_APPEND);
-
-            if (in_array($attribute['$id'], $allowedAttributes)) {
-                /**
-                 * todo find a way to Filter only allowed attribute, while selecting is ok
-                 */
-                //$this->collection->setAttribute('attributes', $attr, Document::SET_TYPE_APPEND);
-            }
         }
 
         $internalAttributes = [
@@ -122,7 +115,8 @@ class Base extends Types
         ];
 
         foreach ($internalAttributes as $attribute) {
-            //$this->collection->setAttribute('attributes', $attribute, Document::SET_TYPE_APPEND);
+            $this->collection->setAttribute('attributes', $attribute, Document::SET_TYPE_APPEND);
+            $allowedAttributes[] = $attribute['key'];
         }
 
         if ($this->isSelectQueryAllowed()) {
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Types.php b/src/Appwrite/Utopia/Database/Validator/Queries/Types.php
index 1a5a8370a0..d1382ef0d3 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Types.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Types.php
@@ -28,14 +28,14 @@ class Types extends Validator
     protected ?QueryContext $context = null;
 
     /**
-     * @param string[] $allowedAttributes
+     * @param array<string> $allowedAttributes
      */
     protected array $allowedAttributes;
 
     /**
      * @param array $types
      * @param QueryContext|null $context
-     * @param array $allowedAttributes
+     * @param array<string> $allowedAttributes
      */
     public function __construct(array $types = [], ?QueryContext $context = null, array $allowedAttributes = [])
     {