diff --git a/CHANGELOG.md b/CHANGELOG.md
index f36c36e50..0b5400cff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 ### To be Released
 
-* chore(term): remove `github.com/andrew-d/go-termutil`, use standard library instead
-* feat(cmd): addon can be retrieve from addon type, not only UUID
-* feat: add database maintenance info with the new `database-maintenance-info` command
-* feat: add database maintenance listing with the new `database-maintenance-list` command
-* feat(addons): add maintenance windows manipulation with the new `addon-config` command
+* chore(term): remove `github.com/andrew-d/go-termutil`, use standard library instead ([PR#974](https://github.com/Scalingo/cli/pull/974))
+* feat(cmd): addon can be retrieve from addon type, not only UUID ([PR#983](https://github.com/Scalingo/cli/pull/983))
+* feat: add database maintenance info with the new `database-maintenance-info` command ([PR#984](https://github.com/Scalingo/cli/pull/984))
+* feat: add database maintenance listing with the new `database-maintenance-list` command ([PR#982](https://github.com/Scalingo/cli/pull/982))
+* feat(addons): add maintenance windows manipulation with the new `addon-config` command ([PR#955](https://github.com/Scalingo/cli/pull/955))
 
 ### 1.29.1
 
diff --git a/cmd/flags.go b/cmd/flags.go
index ab86b0834..9bdc8d9b0 100644
--- a/cmd/flags.go
+++ b/cmd/flags.go
@@ -43,6 +43,9 @@ func addonUUIDFromFlags(c *cli.Context, app string, exitIfMissing ...bool) strin
 		io.Error("Unable to find the addon name, please use --addon flag.")
 		os.Exit(1)
 	}
+	if addonName == "" {
+		return ""
+	}
 
 	var addonUUID string
 	var err error