diff --git a/shell/tmux/.tmux.conf b/shell/tmux/.tmux.conf
index e3f36748..804700bb 100644
--- a/shell/tmux/.tmux.conf
+++ b/shell/tmux/.tmux.conf
@@ -253,4 +253,4 @@ set -g @prefix_highlight_fg colour0
 set -g @prefix_highlight_output_suffix ' #[bg=default] '
 
 # Start plugin manager
-run '~/.tmux/plugins/tpm/tpm'
+if '[ -x ~/.tmux/plugins/tpm/tpm ]' 'run ~/.tmux/plugins/tpm/tpm'
diff --git a/shell/tmux/install b/shell/tmux/install
index 912b600b..7083530c 100755
--- a/shell/tmux/install
+++ b/shell/tmux/install
@@ -13,8 +13,10 @@ case $OSTYPE in
         ;;
 esac
 
-git-repo() { [[ -d $2 ]] || git clone "https://github.com/$1" "$2"; }
+if [[ -z $SERVER ]]; then
+    git-repo() { [[ -d $2 ]] || git clone "https://github.com/$1" "$2"; }
 
-CWD="$(dirname $0)"
-git-repo tmux-plugins/tpm "$CWD/.tmux/plugins/tpm"
-git-repo jimeh/tmuxifier "$CWD/.tmuxifier"
+    CWD="$(dirname $0)"
+    git-repo tmux-plugins/tpm "$CWD/.tmux/plugins/tpm"
+    git-repo jimeh/tmuxifier "$CWD/.tmuxifier"
+fi