diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php
index 0ccaa264bd..1d108c425f 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php
@@ -86,10 +86,12 @@ class Delete extends Base
 
         // Inform scheduler to no longer run function
         $schedule = $dbForPlatform->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('active', false);
-        $authorization->skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
+        if (!$schedule->isEmpty()) {
+            $schedule
+                ->setAttribute('resourceUpdatedAt', DateTime::now())
+                ->setAttribute('active', false);
+            $authorization->skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
+        }
 
         $queueForDeletes
             ->setType(DELETE_TYPE_DOCUMENT)
diff --git a/tests/e2e/Scopes/SchemaPolling.php b/tests/e2e/Scopes/SchemaPolling.php
index 2c3e029905..dfb611d726 100644
--- a/tests/e2e/Scopes/SchemaPolling.php
+++ b/tests/e2e/Scopes/SchemaPolling.php
@@ -19,7 +19,7 @@ trait SchemaPolling
      * @param int $timeoutMs Maximum time to wait in milliseconds
      * @param int $waitMs Time between polling attempts in milliseconds
      */
-    protected function waitForAttribute(string $databaseId, string $containerId, string $attributeKey, int $timeoutMs = 480000, int $waitMs = 500): void
+    protected function waitForAttribute(string $databaseId, string $containerId, string $attributeKey, int $timeoutMs = 900000, int $waitMs = 500): void
     {
         $this->assertEventually(function () use ($databaseId, $containerId, $attributeKey) {
             $attribute = $this->client->call(
@@ -46,7 +46,7 @@ trait SchemaPolling
      * @param int $timeoutMs Maximum time to wait in milliseconds
      * @param int $waitMs Time between polling attempts in milliseconds
      */
-    protected function waitForAttributes(string $databaseId, string $containerId, array $attributeKeys, int $timeoutMs = 480000, int $waitMs = 500): void
+    protected function waitForAttributes(string $databaseId, string $containerId, array $attributeKeys, int $timeoutMs = 900000, int $waitMs = 500): void
     {
         $this->assertEventually(function () use ($databaseId, $containerId, $attributeKeys) {
             $container = $this->client->call(
@@ -87,7 +87,7 @@ trait SchemaPolling
      * @param int $timeoutMs Maximum time to wait in milliseconds
      * @param int $waitMs Time between polling attempts in milliseconds
      */
-    protected function waitForAttributeCount(string $databaseId, string $containerId, int $count, int $timeoutMs = 480000, int $waitMs = 500): void
+    protected function waitForAttributeCount(string $databaseId, string $containerId, int $count, int $timeoutMs = 900000, int $waitMs = 500): void
     {
         $this->assertEventually(function () use ($databaseId, $containerId, $count) {
             $container = $this->client->call(
@@ -126,7 +126,7 @@ trait SchemaPolling
      * @param int $timeoutMs Maximum time to wait in milliseconds
      * @param int $waitMs Time between polling attempts in milliseconds
      */
-    protected function waitForIndex(string $databaseId, string $containerId, string $indexKey, int $timeoutMs = 480000, int $waitMs = 500): void
+    protected function waitForIndex(string $databaseId, string $containerId, string $indexKey, int $timeoutMs = 900000, int $waitMs = 500): void
     {
         $this->assertEventually(function () use ($databaseId, $containerId, $indexKey) {
             $index = $this->client->call(
diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php
index c4c3a18835..e8fb12c2df 100644
--- a/tests/e2e/Services/Functions/FunctionsBase.php
+++ b/tests/e2e/Services/Functions/FunctionsBase.php
@@ -102,11 +102,22 @@ trait FunctionsBase
 
     protected function cleanupFunction(string $functionId): void
     {
-        $function = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey'],
-        ]));
+        $maxRetries = 3;
+        for ($i = 0; $i < $maxRetries; $i++) {
+            $function = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, array_merge([
+                'content-type' => 'application/json',
+                'x-appwrite-project' => $this->getProject()['$id'],
+                'x-appwrite-key' => $this->getProject()['apiKey'],
+            ]));
+
+            if ($function['headers']['status-code'] === 204) {
+                return;
+            }
+
+            if ($i < $maxRetries - 1) {
+                \sleep(1);
+            }
+        }
 
         $this->assertEquals(204, $function['headers']['status-code']);
     }
diff --git a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
index 3da00898c9..ffb8530b3b 100644
--- a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
@@ -68,7 +68,7 @@ class RealtimeConsoleClientTest extends Scope
             ], $this->getHeaders()));
             $this->assertEquals(200, $attribute['headers']['status-code']);
             $this->assertEquals('available', $attribute['body']['status']);
-        }, 120000, 500);
+        }, 900000, 500);
 
         return ['actorsId' => $actorsId, 'databaseId' => $databaseId];
     }
@@ -120,7 +120,7 @@ class RealtimeConsoleClientTest extends Scope
             ], $this->getHeaders()));
             $this->assertEquals(200, $column['headers']['status-code']);
             $this->assertEquals('available', $column['body']['status']);
-        }, 120000, 500);
+        }, 900000, 500);
 
         return ['actorsId' => $actorsId, 'databaseId' => $databaseId];
     }
@@ -151,7 +151,7 @@ class RealtimeConsoleClientTest extends Scope
             ], $this->getHeaders()));
             $this->assertEquals(200, $index['headers']['status-code'], 'Index polling returned ' . $index['headers']['status-code'] . ': ' . json_encode($index['body'] ?? ''));
             $this->assertEquals('available', $index['body']['status']);
-        }, 120000, 500);
+        }, 900000, 500);
 
         return $data;
     }
@@ -182,7 +182,7 @@ class RealtimeConsoleClientTest extends Scope
             ], $this->getHeaders()));
             $this->assertEquals(200, $index['headers']['status-code'], 'Index polling returned ' . $index['headers']['status-code'] . ': ' . json_encode($index['body'] ?? ''));
             $this->assertEquals('available', $index['body']['status']);
-        }, 120000, 500);
+        }, 900000, 500);
 
         return $data;
     }