diff --git a/.spacemacs b/.spacemacs
index c9ddf21..457ee25 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -547,6 +547,10 @@ dump."
 
 (defun custom/generic-improvements ()
   "Generic improvements and packages that are either too small, or not fitting other categories."
+  ;; This 2 hooks fix a shitton of issues with emacs-server and recentf bitch
+  (add-hook 'delete-terminal-functions (lambda (terminal) (recentf-save-list)))
+  (add-hook 'kill-emacs-hook 'recentf-save-list)
+
   ;; Add restclient package
   (use-package restclient
     :config