diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18d9a5ae4e..17e6276719 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Bugfixes
 
+- [#8190](https://github.com/influxdata/influxdb/issues/8190): History file should redact passwords before saving to history.
 - [#8187](https://github.com/influxdata/influxdb/pull/8187): Several statements were missing the DefaultDatabase method
 - [#8022](https://github.com/influxdata/influxdb/issues/8022): Segment violation in models.Tags.Get
 - [#8155](https://github.com/influxdata/influxdb/pull/8155): Simplify admin user check.
diff --git a/cmd/influx/cli/cli.go b/cmd/influx/cli/cli.go
index 67be0cdc9c..102d4a3e3d 100644
--- a/cmd/influx/cli/cli.go
+++ b/cmd/influx/cli/cli.go
@@ -221,6 +221,7 @@ func (c *CommandLine) mainLoop() error {
 				return e
 			}
 			if err := c.ParseCommand(l); err != ErrBlankCommand && !strings.HasPrefix(strings.TrimSpace(l), "auth") {
+				l = influxql.Sanitize(l)
 				c.Line.AppendHistory(l)
 				c.saveHistory()
 			}