diff --git a/.config/kak/discord.kak b/.config/kak/discord.kak
index 63bfc659..e4b5651e 100644
--- a/.config/kak/discord.kak
+++ b/.config/kak/discord.kak
@@ -2,7 +2,7 @@
 
 provide-module discord-rpc %~
     declare-option bool discord_rpc_autostart true
-    define-command -hidden start-discord-rpc %{
+    define-command start-discord-rpc %{
         nop %sh{
             lock="/tmp/kak-discord"
             if [ ! -f "$lock" ]; then
@@ -14,7 +14,7 @@ provide-module discord-rpc %~
             fi
         }
     }
-    define-command -hidden stop-discord-rpc %{
+    define-command stop-discord-rpc %{
         nop %sh{
             lock="/tmp/kak-discord"
             if [ -f "$lock" ]; then
@@ -23,38 +23,20 @@ provide-module discord-rpc %~
             fi
         }
     }
+    hook -once global KakBegin .* %{
+        evaluate-commands %sh{
+            if [ "$kak_opt_discord_rpc_autostart" = "true" ]; then
+                echo "start-discord-rpc"
+            fi
+        }
+    }
+    hook -once -always global KakEnd .* %{
+        evaluate-commands %sh{
+            count="$(kak -l | grep -v '(dead)' | wc -l)"
+            if [ ${count} -le 1 ]; then
+                echo "stop-discord-rpc"
+            fi
+        }
+    }
 ~
 
-# declare-option -hidden str discord_fifo
-
-# define-command -hidden discord-fifo-send -params 1 %{ nop %sh{
-#     { echo "$1" > "$kak_opt_discord_fifo"; } >/dev/null 2>&1 </dev/null &
-# } }
-
-# define-command discord-presence-enable \
-#     -docstring "Enable Discord rich presence for this kakoune session" %{
-#     evaluate-commands %sh{
-#         if [ -z "$kak_opt_discord_fifo" ] && [ "$(pidof vesktop)" ]; then
-#             fifo=${TMPDIR:-/tmp}/kakoune-discord
-#             if [ ! -p "$fifo" ]; then
-#                 mkfifo "$fifo"
-#                 kakoune-discord "$fifo" >/dev/null 2>&1 </dev/null &
-#             fi
-#             cat<<EOF
-# set-option global discord_fifo $fifo
-# discord-fifo-send '+'
-
-# hook global -group discord FocusIn .* %{ discord-fifo-send %reg{%} }
-# hook global -group discord WinDisplay .* %{ discord-fifo-send %reg{%} }
-# hook global -group discord KakEnd .* %{ discord-fifo-send '-' }
-
-# define-command discord-presence-disable \
-#     -docstring "Disable Discord rich presence for this kakoune session" %{
-#     discord-fifo-send '-'
-#     unset-option global discord_fifo
-#     remove-hooks global discord
-# }
-# EOF
-#         fi
-#     }
-# }
diff --git a/.config/kak/extra.kak b/.config/kak/extra.kak
index 1eaddd41..e552656d 100644
--- a/.config/kak/extra.kak
+++ b/.config/kak/extra.kak
@@ -90,7 +90,7 @@ alias global t cwd-terminal
 # discord rich presence
 try %{
     source %exp{%val{config}/discord.kak}
-    require-module discord-rtp
+    require-module discord-rpc
     # hook global -once ClientCreate .* %{
     #     discord-presence-enable
     # }