diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index 5b228d6004..29ac582d5e 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -1654,11 +1654,11 @@ App::get('/v1/database/collections/:collectionId/documents')
             return Query::parse($query);
         }, $queries);
 
-        // TODO@kodumbeats use strict query validation
-        $validator = new QueriesValidator(new QueryValidator($collection->getAttribute('attributes', [])), $collection->getAttribute('indexes', []), false);
-
-        if (!$validator->isValid($queries)) {
-            throw new Exception($validator->getDescription(), 400);
+        if (!empty($queries)) {
+            $validator = new QueriesValidator(new QueryValidator($collection->getAttribute('attributes', [])), $collection->getAttribute('indexes', []), true);
+            if (!$validator->isValid($queries)) {
+                throw new Exception($validator->getDescription(), 400);
+            }
         }
 
         $cursorDocument = null;