diff --git a/scripts/lib/install-node b/scripts/lib/install-node
index 1274b182a0..2919d717a5 100755
--- a/scripts/lib/install-node
+++ b/scripts/lib/install-node
@@ -10,6 +10,7 @@ fi
 source "$NVM_DIR/nvm.sh"
 node_version=6.6.0
 nvm install "$node_version" && nvm alias default "$node_version"
+export NODE_BIN="$(nvm which default)"
 
 # Fix messed-up uid=500 and group write bits produced by nvm
 n=$(which node)
@@ -19,4 +20,5 @@ chmod -R go-w "$n"
 
 # Install node and npm wrappers to /usr/local/bin
 cp "$ZULIP_PATH/../../scripts/setup/node-wrapper" /usr/local/bin/node
+sed -i "s|NODE_PATH|$NODE_BIN|" /usr/local/bin/node
 cp "$ZULIP_PATH/../../scripts/setup/npm-wrapper" /usr/local/bin/npm
diff --git a/scripts/setup/node-wrapper b/scripts/setup/node-wrapper
index 8124dc1e61..bbf3e60ecb 100755
--- a/scripts/setup/node-wrapper
+++ b/scripts/setup/node-wrapper
@@ -1,4 +1,2 @@
 #!/bin/bash
-export NVM_DIR="/usr/local/nvm"
-[ -e "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-node "$@"
+NODE_PATH "$@"