diff --git a/packages/cli/commands/project/upload.js b/packages/cli/commands/project/upload.js
index 22220029d..ac1d073ab 100644
--- a/packages/cli/commands/project/upload.js
+++ b/packages/cli/commands/project/upload.js
@@ -58,9 +58,13 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
     )}`,
   });
 
+  let buildId;
+
   try {
     const upload = await uploadProject(accountId, projectName, filePath);
 
+    buildId = upload.buildId;
+
     spinnies.succeed('upload', {
       text: `Uploaded ${chalk.bold(projectName)} project files to ${chalk.bold(
         accountId
@@ -68,9 +72,8 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
     });
 
     logger.debug(
-      `Project "${projectName}" uploaded and build #${upload.buildId} created`
+      `Project "${projectName}" uploaded and build #${buildId} created`
     );
-    await pollBuildStatus(accountId, projectName, upload.buildId);
   } catch (err) {
     if (err.statusCode === 404) {
       return logger.error(
@@ -92,6 +95,12 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
       })
     );
   }
+
+  try {
+    await pollBuildStatus(accountId, projectName, buildId);
+  } catch (err) {
+    logger.log(err);
+  }
 };
 
 exports.handler = async options => {