diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 6a291ef7f..25f9b8c90 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3073,7 +3073,6 @@ the global options and expect it to be applied to the entire view.")
 
 (defun org-prepare-agenda (&optional name)
   (setq org-todo-keywords-for-agenda nil)
-  (setq org-done-keywords-for-agenda nil)
   (setq org-drawers-for-agenda nil)
   (unless org-agenda-persistent-filter
     (setq org-agenda-tag-filter nil
@@ -3092,6 +3091,7 @@ the global options and expect it to be applied to the entire view.")
 		    (make-string (window-width) org-agenda-block-separator))
 		  "\n"))
 	(narrow-to-region (point) (point-max)))
+    (setq org-done-keywords-for-agenda nil)
     (org-agenda-reset-markers)
     (setq org-agenda-contributing-files nil)
     (setq org-agenda-columns-active nil)