diff --git a/src/Appwrite/Vcs/Comment.php b/src/Appwrite/Vcs/Comment.php
index 90f9c8f95d..e6d6996748 100644
--- a/src/Appwrite/Vcs/Comment.php
+++ b/src/Appwrite/Vcs/Comment.php
@@ -251,7 +251,7 @@ class Comment
         $json = \base64_decode($state);
 
         $builds = \json_decode($json, true);
-        $this->builds = $builds;
+        $this->builds = \is_array($builds) ? $builds : [];
 
         return $this;
     }