diff --git a/internal/app/app.go b/internal/app/app.go
index 87658b0..81716ab 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -246,13 +246,9 @@ func Run(args []string) (int, error) {
 		ctx.args = append([]string{args[0]}, cmdArgs...)
 		for _, cmd := range commands {
 			if cmd.name == args[0] {
-				spin.configure(ctx.stderr, isInteractiveTTY(ctx.stderr) && strings.TrimSpace(os.Getenv("CI")) == "" && ctx.logLevel == logLevelNormal)
-				spin.start("running " + cmd.name)
 				if err := cmd.run(ctx); err != nil {
-					spin.stop()
 					return 1, err
 				}
-				spin.stop()
 				return 0, nil
 			}
 		}
@@ -578,6 +574,7 @@ func runBuildHAKs(ctx context) error {
 	console := newBuildHAKConsole(ctx, p, opts)
 	spin.configure(ctx.stderr, console.spinnerEnabled)
 	spin.start("Build HAKs: starting")
+	defer spin.stop()
 	var result pipeline.BuildResult
 	pipelineOpts := pipeline.BuildHAKOptions{
 		Progress:           console.progress,