diff --git a/CHANGELOG.md b/CHANGELOG.md
index d404639..2e81503 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.2.0 [unreleased]
+
+### Bug Fixes
+
+1. [221](https://github.com/influxdata/influx-cli/pull/221): Fix shell completion for top-level `influx` commands.
+
 ## v2.1.0 [2021-07-29]
 
 ### New Repository
diff --git a/cmd/influx/main.go b/cmd/influx/main.go
index b93e00f..9ea53c9 100644
--- a/cmd/influx/main.go
+++ b/cmd/influx/main.go
@@ -28,6 +28,7 @@ var app = cli.App{
 	Usage:                "Influx Client",
 	UsageText:            "influx [command]",
 	EnableBashCompletion: true,
+	BashComplete:         cli.DefaultAppComplete,
 	Commands: []cli.Command{
 		newVersionCmd(),
 		newPingCmd(),