diff --git a/packages/@ionic/cli/src/commands/deploy/build.ts b/packages/@ionic/cli/src/commands/deploy/build.ts
index c772c808ae..78e720be8c 100644
--- a/packages/@ionic/cli/src/commands/deploy/build.ts
+++ b/packages/@ionic/cli/src/commands/deploy/build.ts
@@ -115,7 +115,7 @@ Apart from ${input('--commit')}, every option can be specified using the full na
 
     build = await this.tailBuildLog(appflowId, buildId, token);
     if (build.state !== 'success') {
-      throw new Error('Build failed');
+      throw new Error(`Build ${build.state}`);
     }
 
   }
@@ -161,7 +161,7 @@ Apart from ${input('--commit')}, every option can be specified using the full na
 
     let isCreatedMessage = false;
     let errorsEncountered = 0;
-    while (!(build && (build.state === 'success' || build.state === 'failed'))) {
+    while (!(build && ['success', 'failed', 'canceled'].includes(build.state))) {
       try {
         await sleep(5000);
         build = await this.getDeployBuild(appflowId, buildId, token);
diff --git a/packages/@ionic/cli/src/commands/package/build.ts b/packages/@ionic/cli/src/commands/package/build.ts
index 403de8dbfe..5b83f3b272 100644
--- a/packages/@ionic/cli/src/commands/package/build.ts
+++ b/packages/@ionic/cli/src/commands/package/build.ts
@@ -264,7 +264,7 @@ This can be used only together with build type ${input('release')} for Android a
 
     build = await this.tailBuildLog(appflowId, buildId, token);
     if (build.state !== 'success') {
-      throw new Error('Build failed');
+      throw new Error(`Build ${build.state}`);
     }
 
     const url = await this.getDownloadUrl(appflowId, buildId, token);
@@ -352,7 +352,7 @@ This can be used only together with build type ${input('release')} for Android a
 
     let isCreatedMessage = false;
     let errorsEncountered = 0;
-    while (!(build && (build.state === 'success' || build.state === 'failed'))) {
+    while (!(build && ['success', 'failed', 'canceled'].includes(build.state))) {
       try {
         await sleep(5000);
         build = await this.getPackageBuild(appflowId, buildId, token);