diff --git a/autocomplete/zsh_autocomplete b/autocomplete/zsh_autocomplete
index e4fddbe8ec..e2c7921212 100644
--- a/autocomplete/zsh_autocomplete
+++ b/autocomplete/zsh_autocomplete
@@ -3,9 +3,17 @@
 _cli_zsh_autocomplete() {
 
   local -a opts
-  opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+  local cur
+  cur=${words[-1]}
+  if [[ "$cur" == "-"* ]]; then
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
+  else
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+  fi
 
-  _describe 'values' opts
+  if [[ "${opts[1]}" != "" ]]; then
+    _describe 'values' opts
+  fi
 
   return
 }