1 files changed, 2 insertions, 0 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 3a330f07a3c..534ba9fa09e 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -631,6 +631,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
   (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
   (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
   (remove-hook 'kill-buffer-hook 'server-kill-buffer))
+
+(add-hook 'server-unload-hook 'server-unload-hook)
 
 (provide 'server)