diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index bce7415a9..358728c5e 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -352,8 +352,11 @@ between the two."
                       (IS-LINUX "xdg-open \"%s\"")))))
   ;; Don't clobber recentf or current workspace with agenda files
   (defun +org|exclude-agenda-buffers-from-workspace ()
-    (let (persp-autokill-buffer-on-remove)
-      (persp-remove-buffer org-agenda-new-buffers (get-current-persp) nil)))
+    (when org-agenda-new-buffers
+      (let (persp-autokill-buffer-on-remove)
+        (persp-remove-buffer org-agenda-new-buffers
+                             (get-current-persp)
+                             nil))))
   (add-hook 'org-agenda-finalize-hook #'+org|exclude-agenda-buffers-from-workspace)
 
   (defun +org*exclude-agenda-buffers-from-recentf (orig-fn &rest args)