diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index 92d2b33ad..a69d34e8b 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -3,7 +3,14 @@
 
 ;; Installs a cutting-edge version of org-mode
 (package! org-plus-contrib)
-(package! org :ignore t) ; ignore org from ELPA
+
+;; Prevent built-in Org from playing into the byte-compilation of
+;; `org-plus-contrib'.
+(when-let* ((orglib (locate-library "org" nil doom-site-load-path)))
+  (setq load-path (delete (substring (file-name-directory orglib) 0 -1)
+                          load-path)))
+;; Ignore org on ELPA, if possible
+(package! org :ignore t)
 
 (package! org-bullets :recipe (:fetcher github :repo "Kaligule/org-bullets"))
 (package! org-yt :recipe (:fetcher github :repo "TobiasZawada/org-yt"))