diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 6a23beed27..1f6500b78c 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -238,6 +238,10 @@ func init() {
 		flags.MigrateGlobalFlags(ctx)
 		return debug.Setup(ctx)
 	}
+	app.After = func(ctx *cli.Context) error {
+		debug.Exit()
+		return nil
+	}
 }
 
 func main() {