diff --git a/.bashrc b/.bashrc
index 4c17adf..494a451 100644
--- a/.bashrc
+++ b/.bashrc
@@ -79,10 +79,9 @@ eval "$(starship init bash)"
 export LC_ALL=en_US.UTF-8
 export LANG=ru_RU.UTF-8
 
-[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
-test -d $NVM_DIR && source /usr/share/nvm/nvm.sh
-test -d $NVM_DIR && source /usr/share/nvm/bash_completion
-test -d $NVM_DIR && source /usr/share/nvm/install-nvm-exec
+export NVM_DIR="$HOME/.nvm"
+[ -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
 
 # auto into tmux session
 if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then