diff --git a/modules/emacs/vterm/config.el b/modules/emacs/vterm/config.el
index 32bc953ba..65cd5ed75 100644
--- a/modules/emacs/vterm/config.el
+++ b/modules/emacs/vterm/config.el
@@ -14,7 +14,8 @@
   (set-env! "SHELL")
   (add-hook 'vterm-mode-hook #'doom|mark-buffer-as-real)
   ;; Automatically kill buffer when vterm exits.
-  (setq-default vterm-exit-functions #'kill-buffer)
+  (add-hook 'vterm-exit-functions #'(lambda (buffer)
+                                      (when buffer (kill-buffer buffer))))
   (when (featurep! :feature evil)
     (evil-set-initial-state 'vterm-mode 'insert)
     ;; Those keys are commonly needed by terminals.