diff --git a/home/user/.bashrc b/home/user/.bashrc
index c7e436c..fd7346b 100644
--- a/home/user/.bashrc
+++ b/home/user/.bashrc
@@ -5,21 +5,10 @@ if \
   [ "$(tty)" != "/dev/tty3" ] && \
   [ -z "$TMUX" ]              && \
   [[ ! "$TERM" =~ tmux ]]     && \
-  command -v tmux &>/dev/null
+  command -v tmux &>/dev/null && \
+  tmux -N -L "$USER" list-sessions &>/dev/null
 then
-    if tmux -N -L "$USER" list-sessions &>/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
-        if [ -n "$SSH_CLIENT" ]; then
-            exec tmux new-session
-        else
-            exec tmux new-session -A
-        fi
-    fi
+    exec tmux -N -L "$USER" new-session
 fi
 
 if [ -f "$HOME/.config/bash/sourcer" ]; then
diff --git a/home/user/.config/zsh/.zshrc b/home/user/.config/zsh/.zshrc
index c39fc80..a5bf910 100644
--- a/home/user/.config/zsh/.zshrc
+++ b/home/user/.config/zsh/.zshrc
@@ -5,21 +5,10 @@ if \
   [ "$(tty)" != "/dev/tty3" ] && \
   [ -z "$TMUX" ]              && \
   [[ ! "$TERM" =~ tmux ]]     && \
-  command -v tmux &>/dev/null
+  command -v tmux &>/dev/null && \
+  tmux -N -L "$USER" list-sessions &>/dev/null
 then
-    if tmux -N -L "$USER" list-sessions &>/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
-        if [ -n "$SSH_CLIENT" ]; then
-            exec tmux new-session
-        else
-            exec tmux new-session -A
-        fi
-    fi
+    exec tmux -N -L "$USER" new-session
 fi
 
 if [ -f "$ZDOTDIR/sourcer" ]; then