diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index 3d2b42346d..817cc58c9f 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -1236,7 +1236,7 @@ class Builds extends Action
 
             // Combine with previous logs if deployment got past build process
             $previousLogs = '';
-            if (!empty($deployment->getAttribute('buildEndedAt', ''))) {
+            if (!is_null($deployment->getAttribute('buildSize', null))) {
                 $previousLogs = $deployment->getAttribute('buildLogs', '');
                 if (!empty($previousLogs)) {
                     $message = $previousLogs . "\n" . $message;
diff --git a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
index ba2d18694a..1f60f9fde6 100644
--- a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
@@ -607,10 +607,8 @@ class RealtimeConsoleClientTest extends Scope
             $this->assertContains("projects.{$projectId}", $response['data']['channels']);
             $this->assertArrayHasKey('buildLogs', $response['data']['payload']);
 
-            if (!empty($response['data']['payload']['buildEndedAt'])) {
-                $this->assertNotEmpty($response['data']['payload']['buildEndedAt']);
+            if (!empty($response['data']['payload']['buildSize'])) {
                 $this->assertNotEmpty($response['data']['payload']['buildStartedAt']);
-                $this->assertNotEmpty($response['data']['payload']['buildDuration']);
                 $this->assertNotEmpty($response['data']['payload']['buildPath']);
                 $this->assertNotEmpty($response['data']['payload']['buildSize']);
                 $this->assertNotEmpty($response['data']['payload']['totalSize']);
@@ -634,6 +632,13 @@ class RealtimeConsoleClientTest extends Scope
         $this->assertContains("projects.{$projectId}", $response['data']['channels']);
         $this->assertEquals("ready", $response['data']['payload']['status']);
 
+        $response = json_decode($client->receive(), true);
+        $this->assertContains("functions.{$functionId}.deployments.{$deploymentId}.update", $response['data']['events']);
+        $this->assertContains('console', $response['data']['channels']);
+        $this->assertContains("projects.{$projectId}", $response['data']['channels']);
+        $this->assertNotEmpty($response['data']['payload']['buildDuration']);
+        $this->assertNotEmpty($response['data']['payload']['buildEndedAt']);
+
         $client->close();
     }
 }