diff --git a/private_dot_config/doom/config.el b/private_dot_config/doom/config.el
index 5b119b2..d502b97 100644
--- a/private_dot_config/doom/config.el
+++ b/private_dot_config/doom/config.el
@@ -521,3 +521,11 @@
     (apply orig-fn args)))
 
 (advice-add 'org-roam-node-read :around #'case-insensitive-org-roam-node-read)
+(defun org-archive-done-tasks ()
+  (interactive)
+  (org-map-entries
+   (lambda ()
+     (org-archive-subtree)
+     (setq org-map-continue-from (org-element-property :begin (org-element-at-point))))
+   "/DONE" 'agenda))
+(add-hook 'kill-emacs-hook #'org-archive-done-tasks)