diff --git a/fish.go b/fish.go
index 6c6cf0c7eb..b1086ebc9e 100644
--- a/fish.go
+++ b/fish.go
@@ -69,7 +69,7 @@ func (cmd *Command) prepareFishCommands(commands []*Command, allCommands *[]stri
 	for _, command := range commands {
 		var completion strings.Builder
 		fmt.Fprintf(&completion,
-			"complete -r -c %s -n '%s' -a '%s'",
+			"complete -x -c %s -n '%s' -a '%s'",
 			cmd.Name,
 			cmd.fishSubcommandHelper(previousCommands, commands),
 			strings.Join(command.Names(), " "),
diff --git a/testdata/expected-fish-full.fish b/testdata/expected-fish-full.fish
index db4b2b5e04..f586c66fda 100644
--- a/testdata/expected-fish-full.fish
+++ b/testdata/expected-fish-full.fish
@@ -17,21 +17,21 @@ complete -c greet -n '__fish_greet_no_subcommand' -l foofile -r
 complete -c greet -n '__fish_greet_no_subcommand' -f -l help -s h -d 'show help'
 complete -c greet -n '__fish_greet_no_subcommand' -f -l version -s v -d 'print the version'
 complete -c greet -n '__fish_seen_subcommand_from config c' -f -l help -s h -d 'show help'
-complete -r -c greet -n '__fish_greet_no_subcommand' -a 'config c' -d 'another usage test'
+complete -x -c greet -n '__fish_greet_no_subcommand' -a 'config c' -d 'another usage test'
 complete -c greet -n '__fish_seen_subcommand_from config c' -l flag -s fl -s f -r
 complete -c greet -n '__fish_seen_subcommand_from config c' -f -l another-flag -s b -d 'another usage text'
 complete -c greet -n '__fish_seen_subcommand_from sub-config s ss' -f -l help -s h -d 'show help'
-complete -r -c greet -n '__fish_seen_subcommand_from config c; and not __fish_seen_subcommand_from sub-config s ss' -a 'sub-config s ss' -d 'another usage test'
+complete -x -c greet -n '__fish_seen_subcommand_from config c; and not __fish_seen_subcommand_from sub-config s ss' -a 'sub-config s ss' -d 'another usage test'
 complete -c greet -n '__fish_seen_subcommand_from sub-config s ss' -f -l sub-flag -s sub-fl -s s -r
 complete -c greet -n '__fish_seen_subcommand_from sub-config s ss' -f -l sub-command-flag -s s -d 'some usage text'
 complete -c greet -n '__fish_seen_subcommand_from info i in' -f -l help -s h -d 'show help'
-complete -r -c greet -n '__fish_greet_no_subcommand' -a 'info i in' -d 'retrieve generic information'
+complete -x -c greet -n '__fish_greet_no_subcommand' -a 'info i in' -d 'retrieve generic information'
 complete -c greet -n '__fish_seen_subcommand_from some-command' -f -l help -s h -d 'show help'
-complete -r -c greet -n '__fish_greet_no_subcommand' -a 'some-command'
+complete -x -c greet -n '__fish_greet_no_subcommand' -a 'some-command'
 complete -c greet -n '__fish_seen_subcommand_from usage u' -f -l help -s h -d 'show help'
-complete -r -c greet -n '__fish_greet_no_subcommand' -a 'usage u' -d 'standard usage text'
+complete -x -c greet -n '__fish_greet_no_subcommand' -a 'usage u' -d 'standard usage text'
 complete -c greet -n '__fish_seen_subcommand_from usage u' -l flag -s fl -s f -r
 complete -c greet -n '__fish_seen_subcommand_from usage u' -f -l another-flag -s b -d 'another usage text'
 complete -c greet -n '__fish_seen_subcommand_from sub-usage su' -f -l help -s h -d 'show help'
-complete -r -c greet -n '__fish_seen_subcommand_from usage u; and not __fish_seen_subcommand_from sub-usage su' -a 'sub-usage su' -d 'standard usage text'
+complete -x -c greet -n '__fish_seen_subcommand_from usage u; and not __fish_seen_subcommand_from sub-usage su' -a 'sub-usage su' -d 'standard usage text'
 complete -c greet -n '__fish_seen_subcommand_from sub-usage su' -f -l sub-command-flag -s s -d 'some usage text'