diff --git a/lisp/org-element.el b/lisp/org-element.el
index 99763e3f9..5574da452 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -8049,7 +8049,7 @@ This function may modify the match data."
         (setq cached-only nil))
       (let (element)
         (when (org-element--cache-active-p)
-          (if (not org-element--cache) (org-element-cache-reset)
+          (if (not (org-with-base-buffer nil org-element--cache)) (org-element-cache-reset)
             (unless cached-only (org-element--cache-sync (current-buffer) epom))))
         (setq element (if cached-only
                           (when (and (org-element--cache-active-p)