diff --git a/core/core-ui.el b/core/core-ui.el
index 24ad30a3d..66b4ec46b 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -316,6 +316,9 @@ DEFAULT is non-nil, set the default mode-line for all buffers."
 (def-package! paren
   :after-call (after-find-file doom-exit-buffer-hook)
   :config
+  (defun doom|disable-show-paren-mode ()
+    "Turn off `show-paren-mode' buffer-locally."
+    (set (make-local-variable 'show-paren-mode) nil))
   (setq show-paren-delay 0.1
         show-paren-highlight-openparen t
         show-paren-when-point-inside-paren t)
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 026c76496..a5690b240 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -56,12 +56,14 @@
      org-indent-mode            ; margin-based indentation
      toc-org-enable             ; auto-table of contents
      auto-fill-mode             ; line wrapping
+     ;; `show-paren-mode' causes flickering with indentation margins made by
+     ;; `org-indent-mode', so we simply turn off show-paren-mode altogether."
+     doom|disable-show-paren-mode
 
      +org|enable-auto-reformat-tables
      +org|enable-auto-update-cookies
      +org|smartparens-compatibility-config
-     +org|unfold-to-2nd-level-or-point
-     +org|show-paren-mode-compatibility))
+     +org|unfold-to-2nd-level-or-point))
 
 
 ;;
@@ -113,11 +115,6 @@ unfold to point on startup."
     (add-hook 'evil-insert-state-exit-hook #'+org|update-cookies nil t))
   (add-hook 'before-save-hook #'+org|update-cookies nil t))
 
-(defun +org|show-paren-mode-compatibility ()
-  "`show-paren-mode' causes flickering with indentation margins made by
-`org-indent-mode', so we simply turn off show-paren-mode altogether."
-  (set (make-local-variable 'show-paren-mode) nil))
-
 
 ;;
 ;; `org-load' hooks