diff --git a/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/src/_deno.tmpl b/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/_deno.tmpl
similarity index 100%
rename from home/dot_oh-my-zsh/custom/plugins/exact_my-completions/src/_deno.tmpl
rename to home/dot_oh-my-zsh/custom/plugins/exact_my-completions/_deno.tmpl
diff --git a/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/src/_volta.tmpl b/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/_volta.tmpl
similarity index 100%
rename from home/dot_oh-my-zsh/custom/plugins/exact_my-completions/src/_volta.tmpl
rename to home/dot_oh-my-zsh/custom/plugins/exact_my-completions/_volta.tmpl
diff --git a/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/empty_my-completions.plugin.zsh b/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/empty_my-completions.plugin.zsh
new file mode 100644
index 00000000..e69de29b
diff --git a/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/my-completions.plugin.zsh b/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/my-completions.plugin.zsh
deleted file mode 100644
index b56f55de..00000000
--- a/home/dot_oh-my-zsh/custom/plugins/exact_my-completions/my-completions.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-fpath+="${0:h}/src"
diff --git a/home/dot_zshrc b/home/dot_zshrc
index 7572096d..3b867d9f 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -106,14 +106,13 @@ plugins=(
   dotenv
   zsh-syntax-highlighting
   zsh-autosuggestions
-  zsh-completions
   my-completions
   )
 
-source "$ZSH/oh-my-zsh.sh"
+# https://github.com/zsh-users/zsh-completions/issues/603
+fpath+="${ZSH_CUSTOM:-"$ZSH/custom"}/plugins/zsh-completions/src"
 
-# https://github.com/ohmyzsh/ohmyzsh/issues/10412
-autoload -U compinit && compinit
+source "$ZSH/oh-my-zsh.sh"
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh