diff --git a/hybris.zsh b/hybris.zsh
index 9204195..b559945 100644
--- a/hybris.zsh
+++ b/hybris.zsh
@@ -45,3 +45,7 @@ export WATCH=all
 export WATCHFMT="%n has %a %l from %M"
 export ROBESPIERRE=/home/hybris/dev/robespierre/infra
 export PATH=$ROBESPIERRE/bin:$HOME/.scripts:$PATH
+
+# Fix for compdef, taken from https://github.com/seletskiy/zsh-zgen-compinit-tweak
+alias compinit='compinit-zgen'
+function compinit-zgen() { grep -q ".zgen" <<< "${@}" && \compinit "${@}" }
diff --git a/zshrc b/zshrc
index 319d10c..df2bbac 100644
--- a/zshrc
+++ b/zshrc
@@ -1,10 +1,6 @@
 # Load zgen
 source "${HOME}/.zgen/zgen.zsh"
 
-# Required for compdef calls to work
-autoload -Uz compinit && \
-   compinit -C 
-
 # Plugins and configuration generator
 if ! zgen saved; then
   # Configuration