diff --git a/bin/run.js b/bin/run.js
index 028bdbc7adf..66ff6cd001c 100755
--- a/bin/run.js
+++ b/bin/run.js
@@ -54,9 +54,9 @@ Run ${chalk.inverse.hex(NETLIFY_CYAN_HEX)('{updateCommand}')} to update`
   try {
     await runProgram(program, argv)
 
-    program.onEnd()
+    await program.onEnd()
   } catch (error) {
-    program.onEnd(error)
+    await program.onEnd(error)
   }
 }
 
diff --git a/src/commands/base-command.ts b/src/commands/base-command.ts
index d710b892c96..5a96f027f08 100644
--- a/src/commands/base-command.ts
+++ b/src/commands/base-command.ts
@@ -437,6 +437,8 @@ export default class BaseCommand extends Command {
       logError(error_ instanceof Error ? error_ : format(error_))
       exit(1)
     }
+
+    exit()
   }
 
   async authenticate(tokenFromFlag?: string) {