diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 6056aced1..c92f40887 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -229,9 +229,9 @@ unfold to point on startup."
 between the two."
   (defun +org|remove-occur-highlights ()
     "Remove org occur highlights on ESC in normal mode."
-    (when (and (derived-mode-p 'org-mode)
-               org-occur-highlights)
-      (org-remove-occur-highlights)))
+    (when org-occur-highlights
+      (org-remove-occur-highlights)
+      t))
   (add-hook 'doom-escape-hook #'+org|remove-occur-highlights)
 
   ;; C-a & C-e act like `doom/backward-to-bol-or-indent' and