diff --git a/zsh/config/.zshenv b/zsh/config/.zshenv
index 344efdc..faad972 100755
--- a/zsh/config/.zshenv
+++ b/zsh/config/.zshenv
@@ -102,4 +102,7 @@ export GPG_TTY=$(tty)
 # Starship Prompt
 export STARSHIP_CONFIG="$XDG_CONFIG_HOME/starship/starship.toml"
 
+# Zoxide
+export _ZO_DATA_DIR="$XDG_DATA_HOME"
+
 [ -f "$LOCAL_ENV" ] && source "$LOCAL_ENV"
diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc
index e77856e..db49d7b 100755
--- a/zsh/config/.zshrc
+++ b/zsh/config/.zshrc
@@ -252,4 +252,5 @@ function use-gpg-agent-for-ssh {
 }
 use-gpg-agent-for-ssh
 
-eval "$(direnv hook zsh)"
+command -v direnv >/dev/null 2>&1 && eval "$(direnv hook zsh)"
+command -v zoxide >/dev/null 2>&1 && eval "$(zoxide init --cmd cd zsh)"