diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28dd2947..8dba7032 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ BREAKING CHANGES:
  - [types] switched to using `gogo/protobuf` for code generation
  - [types] use `customtype` feature of `gogo/protobuf` to replace `[]byte` with `data.Bytes` in all generated types :)
     - this eliminates the need for additional types like ResultQuery
+ - [abci-cli] codes are printed as their number instead of a message, except for `code == 0`, which is still printed as `OK`
 
 FEATURES:
  - [types] added Tags field to ResponseDeliverTx
diff --git a/cmd/abci-cli/abci-cli.go b/cmd/abci-cli/abci-cli.go
index 25786b37..ef8b9063 100644
--- a/cmd/abci-cli/abci-cli.go
+++ b/cmd/abci-cli/abci-cli.go
@@ -516,7 +516,12 @@ func printResponse(cmd *cobra.Command, args []string, rsp response) {
 	}
 
 	// Always print the status code.
-	fmt.Printf("-> code: %d\n", rsp.Code)
+	if rsp.Code == types.CodeTypeOK {
+		fmt.Printf("-> code: OK\n")
+	} else {
+		fmt.Printf("-> code: %d\n", rsp.Code)
+
+	}
 
 	if len(rsp.Data) != 0 {
 		// Do no print this line when using the commit command