diff --git a/shell/+tmux/.tmux.conf b/shell/+tmux/.tmux.conf
index 85f54081..60154772 100644
--- a/shell/+tmux/.tmux.conf
+++ b/shell/+tmux/.tmux.conf
@@ -1,8 +1,10 @@
 # -- GENERAL -----------------------------
 
 set -g default-terminal screen-256color
-set -g default-shell $SHELL
 set -g default-command $SHELL
+# Prevent double-execution of profile, $SHELL needs to be explicitly in profile
+# though
+set -g default-shell /bin/sh
 set -s focus-events on
 # increase scrollback buffer size
 set -g history-limit 10000
diff --git a/shell/+zsh/.zshenv b/shell/+zsh/.zshenv
index fd04b67e..58b2a5dc 100644
--- a/shell/+zsh/.zshenv
+++ b/shell/+zsh/.zshenv
@@ -14,6 +14,7 @@ fpath=(
 )
 
 export LESS='-g -i -M -R -S -w -z-4'
+export SHELL=$(which zsh)
 if is-callable lesspipe; then
     export LESSOPEN='| /usr/bin/env lesspipe %s 2>&-'
 fi