diff --git a/lisp/doom-editor.el b/lisp/doom-editor.el
index 2e5257f4d..8ea66f8e3 100644
--- a/lisp/doom-editor.el
+++ b/lisp/doom-editor.el
@@ -91,7 +91,8 @@ possible."
       delete-old-versions t ; clean up after itself
       kept-old-versions 5
       kept-new-versions 5
-      backup-directory-alist (list (cons "." (concat doom-cache-dir "backup/"))))
+      backup-directory-alist `(("." . ,(concat doom-cache-dir "backup/")))
+      tramp-backup-directory-alist backup-directory-alist)
 
 ;; But turn on auto-save, so we have a fallback in case of crashes or lost data.
 ;; Use `recover-file' or `recover-session' to recover them.
@@ -102,8 +103,8 @@ possible."
       auto-save-include-big-deletions t
       ;; Keep it out of `doom-emacs-dir' or the local directory.
       auto-save-list-file-prefix (concat doom-cache-dir "autosave/")
-      auto-save-file-name-transforms
-      (list (list ".*" auto-save-list-file-prefix t)))
+      auto-save-file-name-transforms `((".*" ,auto-save-list-file-prefix t))
+      tramp-auto-save-directory (concat doom-cache-dir "tramp-autosave/"))
 
 (add-hook! 'after-save-hook
   (defun doom-guess-mode-h ()
diff --git a/modules/emacs/tramp/config.el b/modules/emacs/tramp/config.el
index aa1f7981a..79c94107c 100644
--- a/modules/emacs/tramp/config.el
+++ b/modules/emacs/tramp/config.el
@@ -13,9 +13,7 @@
         remote-file-name-inhibit-auto-save-visited t
         tramp-copy-size-limit (* 1024 1024) ; 1mb
         tramp-use-scp-direct-remote-copying t
-        tramp-completion-reread-directory-timeout 60
-        tramp-backup-directory-alist backup-directory-alist
-        tramp-auto-save-directory  (concat doom-cache-dir "tramp-autosave/"))
+        tramp-completion-reread-directory-timeout 60)
 
   (unless (featurep :system 'windows)
     ;; On windows pscp/scp > ssh, everywhere else ssh is better. sshx is even