diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d4e3a7b5a..a3ee95d96 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -39,7 +39,7 @@ Completions
   - ``otool``
 - git's completion for ``git-foo``-style commands was fixed (:issue:`9457`)
 - File completion now offers ``../`` and ``./`` again (:issue:`9477`)
-
+- Completion for ``terraform`` now asks for a parameter after ``terraform init -backend-config``. (:issue:`9498`)
 
 Improved terminal support
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/share/completions/terraform.fish b/share/completions/terraform.fish
index 14a33d5ae..42980182d 100644
--- a/share/completions/terraform.fish
+++ b/share/completions/terraform.fish
@@ -81,7 +81,7 @@ complete -r -c terraform -n "__fish_seen_subcommand_from import" -o var-file -d
 complete -f -c terraform -n __fish_terraform_needs_command -a init -d "Initialize a new or existing Terraform configuration"
 complete -f -c terraform -n "__fish_seen_subcommand_from init" -o backend=false -d "Disable backend initialization"
 complete -f -c terraform -n "__fish_seen_subcommand_from init" -o cloud=false -d "Disable backend initialization"
-complete -f -c terraform -n "__fish_seen_subcommand_from init" -o backend-config -d "Backend configuration"
+complete -r -c terraform -n "__fish_seen_subcommand_from init" -o backend-config -d "Backend configuration"
 complete -f -c terraform -n "__fish_seen_subcommand_from init" -o force-copy -d "Suppress prompts about copying state data"
 complete -f -c terraform -n "__fish_seen_subcommand_from init" -o from-module -d "Copy the module into target directory before init"
 complete -f -c terraform -n "__fish_seen_subcommand_from init" -o get=false -d "Disable downloading modules for this configuration"