diff --git a/functions/completion/_autocomplete.command b/functions/completion/_autocomplete.command
index 77f1d91..14a84af 100644
--- a/functions/completion/_autocomplete.command
+++ b/functions/completion/_autocomplete.command
@@ -1,7 +1,6 @@
 #compdef -command-
+
 local -P ret=1
-_expand_alias "$@" &&
-	  ret=0
 _autocd "$@" &&
     ret=0
 return ret
diff --git a/scripts/.autocomplete.config b/scripts/.autocomplete.config
index 9a2c1e2..9595b89 100644
--- a/scripts/.autocomplete.config
+++ b/scripts/.autocomplete.config
@@ -25,14 +25,7 @@ autocomplete:config:cache-path() {
   reply=( "${XDG_CACHE_HOME:-$HOME/.cache}/zsh/compcache" )
 }
 
-builtin zstyle -e ':completion:*' completer autocomplete:config:completer
-autocomplete:config:completer() {
-  if [[ $CURRENT -eq 1 && -z $PREFIX$SUFFIX && $compstate[context] == command ]]; then
-    reply=( _complete )
-  else
-    reply=( _complete _prefix _ignored _correct _approximate )
-  fi
-}
+builtin zstyle ':completion:*' completer _complete _prefix _ignored _correct _approximate
 
 builtin zstyle ':completion:*:expand:*' tag-order '! original' -
 builtin zstyle -e ':completion:*:-command-:*' tag-order autocomplete:config:tag-order:command