diff --git a/modules/os/tty/packages.el b/modules/os/tty/packages.el
index 5f1cef5b4..52bc47581 100644
--- a/modules/os/tty/packages.el
+++ b/modules/os/tty/packages.el
@@ -9,4 +9,8 @@
   (package! xclip :pin "2951c6b62b29780c7a35c64601a59999b83aa145"))
 
 (when (featurep! :editor evil)
-  (package! evil-terminal-cursor-changer :pin "b49ca4393d2f3cc6014174950059b36a5cb22949"))
+  (package! evil-terminal-cursor-changer
+    ;; HACK Fix #3845: original package is abandoned. This fork fixes a breaking
+    ;;      bug that crashes the first terminal frame opened from the daemon.
+    :recipe (:host github :repo "kisaragi-hiu/evil-terminal-cursor-changer")
+    :pin "24755a18a311226933946f7218684dab5960ebc9"))