diff --git a/cmd/internal/common/exit.go b/cmd/internal/common/exit.go
index b8acf0143..13f447af4 100644
--- a/cmd/internal/common/exit.go
+++ b/cmd/internal/common/exit.go
@@ -51,8 +51,13 @@ func ExitOnErr(cmd *cobra.Command, errFmt string, err error) {
 	}
 
 	cmd.PrintErrln(err)
-	if cmd.PersistentPostRun != nil {
-		cmd.PersistentPostRun(cmd, nil)
+	for p := cmd; p != nil; p = p.Parent() {
+		if p.PersistentPostRun != nil {
+			p.PersistentPostRun(cmd, nil)
+			if !cobra.EnableTraverseRunHooks {
+				break
+			}
+		}
 	}
 	os.Exit(code)
 }