diff --git a/modules/tahani.nix b/modules/tahani.nix
index 2a9761a..99e650b 100644
--- a/modules/tahani.nix
+++ b/modules/tahani.nix
@@ -57,7 +57,12 @@
 		# Auto-start zellij in nushell on tahani (headless server)
 		programs.nushell.extraConfig = ''
 			if $nu.is-interactive and ('SSH_CONNECTION' in ($env | columns)) and ('ZELLIJ' not-in ($env | columns)) {
-				exec zellij attach -c
+				try {
+					zellij attach -c main
+					exit
+				} catch {
+					print "zellij auto-start failed; staying in shell"
+				}
 			}
 		'';