diff --git a/shared/.zshrc b/shared/.zshrc
index ef277bd..2275896 100644
--- a/shared/.zshrc
+++ b/shared/.zshrc
@@ -45,6 +45,11 @@ eval "$(keychain --eval --quiet github git)"
 # direnv hook
 eval "$(direnv hook zsh)"
 
+# Start Emacs daemon if not already running
+if ! emacsclient -e nil &>/dev/null; then
+  emacs --daemon &>/dev/null &
+fi
+
 echo -ne '\e[1 q'
 
 export NVM_DIR="$HOME/.nvm"