diff --git a/rcfiles/zshrc b/rcfiles/zshrc
index e2245c8..91993b5 100644
--- a/rcfiles/zshrc
+++ b/rcfiles/zshrc
@@ -62,7 +62,7 @@ function set_win_title(){
 precmd_functions+=(set_win_title)
 
 # start zellij
-if [ "$TERM_PROGRAM" != "vscode" ]; then
+if [[ -v "$WITHZELLIJ" && "$TERM_PROGRAM" != "vscode" ]]; then
   eval "$(zellij setup --generate-auto-start zsh)"
 fi
 
diff --git a/zellij.nix b/zellij.nix
index 5defe42..790ea34 100644
--- a/zellij.nix
+++ b/zellij.nix
@@ -1,11 +1,12 @@
 { config, pkgs, ... }:
 {
   home.sessionVariables = {
-    ZELLIJ_AUTO_EXIT = "true";
+    ZELLIJ_AUTO_EXIT = "false";
   };
 
   programs.zellij= {
     enable = true;
+    enableZshIntegration = false;
     settings = {
       copy_command = "${pkgs.xclip}/bin/xclip -selection clipboard";
     };