diff --git a/modules/fox/packages.scm b/modules/fox/packages.scm
index 2c0e2a3..db5ad14 100644
--- a/modules/fox/packages.scm
+++ b/modules/fox/packages.scm
@@ -90,7 +90,9 @@ your morning, and an auto-update tool that makes it easy to keep up with the lat
         (list "/usr/bin/emacs"
               "--fg-daemon")
         #:log-file (format #f "~a/.local/var/log/emacs.log" (getenv "HOME"))))
-    (stop #~(make-kill-destructor)))))
+    (stop
+     #~(make-system-destructor
+        '("/usr/bin/emacsclient" "--eval"  "(kill-emacs)"))))))
 
 (define home-emacs-service-type
   (service-type (name 'emacs-configuration)