diff --git a/command.go b/command.go
index 3b7c97ca97..e80432ade2 100644
--- a/command.go
+++ b/command.go
@@ -257,7 +257,7 @@ func (cmd *Command) setupDefaults(osArgs []string) {
 	}
 
 	if cmd.EnableShellCompletion || cmd.Root().shellCompletion {
-		completionCommand := buildCompletionCommand(osArgs[0])
+		completionCommand := buildCompletionCommand(cmd.Name)
 
 		if cmd.ShellCompletionCommandName != "" {
 			tracef(