diff --git a/completions/rbenv.fish b/completions/rbenv.fish
index 3ca8e945..d3474105 100644
--- a/completions/rbenv.fish
+++ b/completions/rbenv.fish
@@ -18,5 +18,6 @@ end
 
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a '(rbenv commands)'
 for cmd in (rbenv commands)
-  complete -f -c rbenv -n "__fish_rbenv_using_command $cmd" -a "(rbenv completions $cmd)"
+  complete -f -c rbenv -n "__fish_rbenv_using_command $cmd" -a \
+    "(rbenv completions (commandline -opc)[2..-1])"
 end