diff --git a/.config/fish/functions/kak-session.fish b/.config/fish/functions/kak-session.fish
index cc1228fd..257ea785 100644
--- a/.config/fish/functions/kak-session.fish
+++ b/.config/fish/functions/kak-session.fish
@@ -48,7 +48,11 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
             set fifo "$fifo_dir/fifo"
             mkfifo "$fifo"
 
+            if not set -gq nokakdaemon
             setsid kak -d -s "$session_id" -E "cd %[$kakroot]; echo -to-file $fifo ready" &
+            else
+            setsid kak -s "$session_id" -E "cd %[$kakroot]; echo -to-file $fifo ready" &
+            end
 
             # once $fifo has data, the kakoune server has initialized.
             cat $fifo >/dev/null
@@ -76,7 +80,11 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
             set fifo "$fifo_dir/fifo"
             mkfifo "$fifo"
 
+            if not set -gq nokakdaemon
             setsid kak -d -s "$session_id" -E "cd %[$git_dir]; echo -to-file $fifo ready" &
+            else
+            setsid kak -s "$session_id" -E "cd %[$git_dir]; echo -to-file $fifo ready" &
+            end
 
             # once $fifo has data, the kakoune server has initialized.
             cat $fifo >/dev/null
diff --git a/.config/fish/functions/kakrc.fish b/.config/fish/functions/kakrc.fish
index c7e387aa..993cb9f8 100644
--- a/.config/fish/functions/kakrc.fish
+++ b/.config/fish/functions/kakrc.fish
@@ -1,5 +1,6 @@
 function kakrc --description "Edit kakrc. -c to force a new session."
     if test "$argv[1]" != -c || test "$argv[1]" != new
+        # set -g nokakdaemon
         kak-session ~/.config/kak/kakrc
     else
         kak -e 'cd ~/.config/kak' ~/.config/kak/kakrc