diff --git a/pkg/commands/root.go b/pkg/commands/root.go
index efe62ced2a27..dee8933db2c8 100644
--- a/pkg/commands/root.go
+++ b/pkg/commands/root.go
@@ -84,7 +84,9 @@ func (e *Executor) persistentPostRun(_ *cobra.Command, _ []string) error {
 		trace.Stop()
 	}
 
-	os.Exit(e.exitCode)
+	if e.exitCode != exitcodes.Success {
+		os.Exit(e.exitCode)
+	}
 
 	return nil
 }