diff --git a/modules/ui/indent-guides/config.el b/modules/ui/indent-guides/config.el
index d8128a898..61106dc43 100644
--- a/modules/ui/indent-guides/config.el
+++ b/modules/ui/indent-guides/config.el
@@ -19,7 +19,7 @@
             #'+indent-guides-init-faces-h)
 
   ;; `highlight-indent-guides' breaks when `org-indent-mode' is active
-  (add-hook! 'org-indent-mode-hook
+  (add-hook! 'org-mode-local-vars-hook
     (defun +indent-guides-disable-maybe-h ()
-      (when highlight-indent-guides-mode
+      (when (and highlight-indent-guides-mode org-indent-mode)
         (highlight-indent-guides-mode -1)))))