diff --git a/.zprofile b/.zprofile
index b706f2a..d8dea43 100644
--- a/.zprofile
+++ b/.zprofile
@@ -6,8 +6,3 @@ if [ -d "$ASDF_GO" ]; then
 	ASDF_GOBIN="$ASDF_GO/packages/bin/"
 	PATH="$ASDF_GOBIN:$PATH"
 fi
-
-export NVM_DIR="$HOME/.nvm"
-if [ -s "$NVM_DIR/nvm.sh" ]; then
-	\. "$NVM_DIR/nvm.sh"          # This loads nvm
-fi
diff --git a/.zshrc b/.zshrc
index 3692aed..fdac9b0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -50,6 +50,12 @@ if [ -d "$HOME/.asdf" ]; then
 	\. "$HOME/.asdf/asdf.sh"
 fi
 
+export NVM_DIR="$HOME/.nvm"
+if [ -s "$NVM_DIR/nvm.sh" ]; then
+	[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+	[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+fi
+
 source ~/.aliases
 fpath+=~/.zfunc
 autoload -U compinit; compinit