diff --git a/tools/cli/infrastructure.go b/tools/cli/infrastructure.go
index ff34589f1..d705187f4 100644
--- a/tools/cli/infrastructure.go
+++ b/tools/cli/infrastructure.go
@@ -397,4 +397,5 @@ func Init(root *cobra.Command) {
 	root.SetUsageFunc(show_usage)
 	root.SetHelpFunc(show_help)
 	root.SetHelpCommand(&cobra.Command{Hidden: true})
+	root.CompletionOptions.DisableDefaultCmd = true
 }