diff --git a/src/Appwrite/Utopia/Database/Validator/Query.php b/src/Appwrite/Utopia/Database/Validator/Query.php
new file mode 100644
index 0000000000..eeb5b51a76
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Query.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator;
+
+use Utopia\Database\Validator\UID;
+use Utopia\Database\Validator\Query as QueryValidator;
+
+class Query extends QueryValidator
+{
+    protected function isValidCursor($cursor): bool
+    {
+        $validator = new UID();
+
+        if ($validator->isValid($cursor)) {
+            return true;
+        }
+
+        $this->message = 'Invalid cursor: ' . $validator->getDescription();
+        return false;
+    }
+}