diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 2e8d1f6..bd65a1d 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -362,7 +362,7 @@ set -g @sidebar-tree-command 'tree -C'
 # ==============================================
 
 # Session is considered to be remote when we ssh into host
-if-shell 'test -n "$SSH_CLIENT"' \
+if-shell -b '[ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]' \
     'source-file ~/.tmux/tmux.remote.conf'
 
 # We want to have single prefix key "C-a", usable both for local and remote session