diff --git a/home/user/.bashrc b/home/user/.bashrc
index 7377e06..decf2fa 100644
--- a/home/user/.bashrc
+++ b/home/user/.bashrc
@@ -7,10 +7,18 @@ if \
   [[ ! "$TERM" =~ tmux ]]     && \
   command -v tmux &>/dev/null
 then
-    if systemctl -q --user is-active tmux; then
-        exec tmux -N -L "$USER" new-session -A
+    if tmux -N -L "$USER" server-info &>/dev/null; then
+        if [ -n "$SSH_CLIENT" ]; then
+            exec tmux -N -L "$USER" new-session
+        else
+            exec tmux -N -L "$USER" new-session -A
+        fi
     else
-        exec tmux new-session -A
+        if [ -n "$SSH_CLIENT" ]; then
+            exec tmux new-session
+        else
+            exec tmux new-session -A
+        fi
     fi
 fi
 
diff --git a/home/user/.config/zsh/.zshrc b/home/user/.config/zsh/.zshrc
index dcc4471..e24ea6a 100644
--- a/home/user/.config/zsh/.zshrc
+++ b/home/user/.config/zsh/.zshrc
@@ -7,10 +7,18 @@ if \
   [[ ! "$TERM" =~ tmux ]]     && \
   command -v tmux &>/dev/null
 then
-    if systemctl -q --user is-active tmux; then
-        exec tmux -N -L "$USER" new-session -A
+    if tmux -N -L "$USER" server-info &>/dev/null; then
+        if [ -n "$SSH_CLIENT" ]; then
+            exec tmux -N -L "$USER" new-session
+        else
+            exec tmux -N -L "$USER" new-session -A
+        fi
     else
-        exec tmux new-session -A
+        if [ -n "$SSH_CLIENT" ]; then
+            exec tmux new-session
+        else
+            exec tmux new-session -A
+        fi
     fi
 fi