diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
index b5a2bf9b74..8427ee6cd2 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
@@ -97,6 +97,10 @@ class Upsert extends Action
             throw new Exception($this->getMissingPayloadException());
         }
 
+        if (\array_is_list($data) && \count($data) > 1) { // Allow 1 associated array
+            throw new Exception($this->getMissingPayloadException());
+        }
+
         $isAPIKey = Auth::isAppUser(Authorization::getRoles());
         $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
 
@@ -265,7 +269,13 @@ class Upsert extends Action
         }
 
         $collectionsCache = [];
+
+        if (empty($upserted[0])) {
+            $upserted[0] = $dbForProject->getDocument('database_' . $database->getSequence() . '_collection_' . $collection->getSequence(), $documentId);
+        }
+
         $document = $upserted[0];
+
         $this->processDocument(
             database: $database,
             collection: $collection,
diff --git a/tests/e2e/Services/Databases/Legacy/DatabasesBase.php b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
index 702ce6854d..5fd8066584 100644
--- a/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
@@ -1728,6 +1728,35 @@ trait DatabasesBase
 
         $this->assertEquals('Thor: Ragnarok', $document['body']['title']);
 
+        /**
+         * Resubmit same document, nothing to update
+         */
+        $document = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/documents/' . $documentId, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'title' => 'Thor: Ragnarok',
+                'releaseYear' => 2000,
+                'integers' => [],
+                'birthDay' => null,
+                'duration' => null,
+                'starringActors' => [],
+                'actors' => [],
+                'tagline' => '',
+                'description' => '',
+            ],
+            'permissions' => [
+                Permission::read(Role::users()),
+                Permission::update(Role::users()),
+                Permission::delete(Role::users()),
+            ],
+        ]);
+
+        $this->assertEquals(200, $document['headers']['status-code']);
+        $this->assertEquals('Thor: Ragnarok', $document['body']['title']);
+        $this->assertCount(3, $document['body']['$permissions']);
+
         $document = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/documents/' . $documentId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
diff --git a/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
index e36543fd55..0b92208c95 100644
--- a/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
@@ -1693,6 +1693,56 @@ trait DatabasesBase
 
         $this->assertEquals('Thor: Ragnarok', $row['body']['title']);
 
+        /**
+         * Resubmit same document, nothing to update
+         */
+        $row = $this->client->call(Client::METHOD_PUT, '/tablesdb/' . $databaseId . '/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'title' => 'Thor: Ragnarok',
+                'releaseYear' => 2000,
+                'integers' => [],
+                'birthDay' => null,
+                'duration' => null,
+                'starringActors' => [],
+                'actors' => [],
+                'tagline' => '',
+                'description' => '',
+            ],
+            'permissions' => [
+                Permission::read(Role::users()),
+                Permission::update(Role::users()),
+                Permission::delete(Role::users()),
+            ],
+        ]);
+
+        $this->assertEquals(200, $row['headers']['status-code']);
+        $this->assertEquals('Thor: Ragnarok', $row['body']['title']);
+        $this->assertCount(3, $row['body']['$permissions']);
+
+        /**
+         * Do not allow array list
+         */
+        $row = $this->client->call(Client::METHOD_PUT, '/tablesdb/' . $databaseId . '/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                [
+                    'title' => 'Thor: Ragnarok 1',
+                ],
+                [
+                    'title' => 'Thor: Ragnarok 2',
+                ]
+            ],
+            'permissions' => [
+                Permission::read(Role::users()),
+            ],
+        ]);
+        $this->assertEquals(400, $row['headers']['status-code']);
+
         $row = $this->client->call(Client::METHOD_PUT, '/tablesdb/' . $databaseId . '/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],