diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 9405975..ad4fa6b 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -229,8 +229,14 @@
       fnm env --use-on-cd --shell fish | source
 
       # Auto start tmux
-      if status --is-interactive; and not set -q TMUX
-        tmux attach-session -d -t main || tmux new-session -s main
+      if status is-interactive; and not set -q TMUX
+        if tmux list-sessions >/dev/null 2>&1
+          # Attach to the first available session
+          tmux attach-session
+        else
+          # Create a new session
+          tmux new-session -t default
+        end
       end
     '';