diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php
index 0a2dd2f186..7f2a362e7d 100644
--- a/src/Appwrite/Migration/Migration.php
+++ b/src/Appwrite/Migration/Migration.php
@@ -195,17 +195,23 @@ abstract class Migration
      * @return iterable<Document>
      * @throws \Exception
      */
-    public function documentsIterator(string $collectionId): iterable
+    public function documentsIterator(string $collectionId, $queries = []): iterable
     {
         $sum = 0;
         $nextDocument = null;
         $collectionCount = $this->projectDB->count($collectionId);
+        $queries[] = Query::limit($this->limit);
 
         do {
-            $queries = [Query::limit($this->limit)];
             if ($nextDocument !== null) {
-                $queries[] = Query::cursorAfter($nextDocument);
+                $lastQuery = $queries[\count($queries) - 1];
+                if ($lastQuery->getMethod() === 'cursorAfter') {
+                    $queries[\count($queries) - 1] = Query::cursorAfter($nextDocument);
+                } else {
+                    $queries[] = Query::cursorAfter($nextDocument);
+                }
             }
+
             $documents = $this->projectDB->find($collectionId, $queries);
             $count = count($documents);
             $sum += $count;
diff --git a/src/Appwrite/Migration/Version/V19.php b/src/Appwrite/Migration/Version/V19.php
index 6f2cbfac49..b8c2c54650 100644
--- a/src/Appwrite/Migration/Version/V19.php
+++ b/src/Appwrite/Migration/Version/V19.php
@@ -648,11 +648,7 @@ class V19 extends Migration
 
     private function migrateEnumAttributeSize(): void
     {
-        foreach ($this->documentsIterator('attributes') as $attribute) {
-            if ($attribute->getAttribute('format') !== 'enum' || $attribute->getAttribute('size') >= Database::LENGTH_KEY) {
-                return;
-            }
-
+        foreach ($this->documentsIterator('attributes', [Query::equal('format', ['enum']), Query::lessThan('size', Database::LENGTH_KEY)]) as $attribute) {
             $attribute->setAttribute('size', Database::LENGTH_KEY);
             $this->projectDB->updateDocument('attributes', $attribute->getId(), $attribute);
             $databaseInternalId = $attribute->getAttribute('databaseInternalId');