diff --git a/tmux/local.conf b/tmux/local.conf
index fc21809..689babd 100644
--- a/tmux/local.conf
+++ b/tmux/local.conf
@@ -281,6 +281,7 @@ set -g update-environment \
   SSH_AUTH_SOCK\
   SSH_AGENT_PID\
   SSH_CONNECTION\
+  SSH_CLIENT\
   SSH_TTY\
   WINDOWID\
   XAUTHORITY"
@@ -309,8 +310,11 @@ set -g @open-S 'https://www.google.com/search?q='
 # ==============================================
 
 # Session is considered to be remote when we ssh into host
-if-shell 'test -n "$SSH_CLIENT"' \
-  'source-file ~/.dots/tmux/remote.conf'
+#if-shell 'test -n "$SSH_CLIENT"' \
+#  'source-file ~/.dots/tmux/remote.conf'
+
+set-hook -g session-created "if-shell 'test -n \"$SSH_CONNECTION\"' 'set status-position bottom' 'set -u status-position'"
+set-hook -g client-attached "if-shell 'test -n \"$SSH_CONNECTION\"' 'set status-position bottom' 'set -u status-position'"
 
 # We want to have single prefix key "C-a", usable both for local and remote session
 # we don't want to "C-a" + "a" approach either
@@ -345,5 +349,5 @@ run '~/.dots/tmux/plugins/tmux-open/open.tmux'
 run '~/.dots/tmux/plugins/tmux-sidebar/sidebar.tmux'
 run '~/.dots/tmux/plugins/tmux-yank/yank.tmux'
 
-run '~/.dots/tmux/plugins/tmux-ressurect/resurrect.tmux'
-run '~/.dots/tmux/plugins/tmux-continuum/continuum.tmux'
+#run '~/.dots/tmux/plugins/tmux-ressurect/resurrect.tmux'
+#run '~/.dots/tmux/plugins/tmux-continuum/continuum.tmux'