diff --git a/modules/ui/indent-guides/config.el b/modules/ui/indent-guides/config.el
index bd6261dcf..202d6efa0 100644
--- a/modules/ui/indent-guides/config.el
+++ b/modules/ui/indent-guides/config.el
@@ -10,4 +10,11 @@
   (defun +indent-guides-for-all-but-first-column (level responsive display)
     (unless (< level 1)
       (highlight-indent-guides--highlighter-default level responsive display)))
-  (setq highlight-indent-guides-highlighter-function #'+indent-guides-for-all-but-first-column))
+  (setq highlight-indent-guides-highlighter-function #'+indent-guides-for-all-but-first-column)
+
+  (defun +indent-guides|disable-maybe ()
+    (when highlight-indent-guides
+      (highlight-indent-guides -1)))
+  ;; `highlight-indent-guides' breaks in `visual-line-mode'
+  (add-hook 'visual-line-mode-hook #'+indent-guides|disable-maybe)
+  (add-hook 'org-indent-mode-hook #'+indent-guides|disable-maybe))