diff --git a/components/public-api/typescript-common/src/public-api-converter.ts b/components/public-api/typescript-common/src/public-api-converter.ts
index 6bfe0bab122d7c..416127462680ec 100644
--- a/components/public-api/typescript-common/src/public-api-converter.ts
+++ b/components/public-api/typescript-common/src/public-api-converter.ts
@@ -413,8 +413,8 @@ export class PublicAPIConverter {
         status.phase.name = this.toPhase(arg);
         status.instanceId = arg.id;
         status.conditions = new WorkspaceStatus_WorkspaceConditions({
-            failed: arg.status.conditions.failed,
-            timeout: arg.status.conditions.timeout,
+            failed: arg.status.conditions?.failed,
+            timeout: arg.status.conditions?.timeout,
         });
         status.gitStatus = this.toGitStatus(arg, status.gitStatus);