diff --git a/modules/editor/whitespace/config.el b/modules/editor/whitespace/config.el
index 271144080..50cf5c9e2 100644
--- a/modules/editor/whitespace/config.el
+++ b/modules/editor/whitespace/config.el
@@ -60,6 +60,14 @@ or if the current buffer is read-only or not file-visiting."
         (cl-pushnew 'face whitespace-style) ; must be first
         (whitespace-mode +1))))
 
+  ;; Fix #8573: Editorconfig may change the tab-width or indent style later in a
+  ;;   file's init process, so whitespace-mode needs refreshing.
+  (add-hook! 'editorconfig-after-apply-functions :append
+    (defun +whitespace-highlight-incorrect-indentation-again-h (props)
+      (when (and (bound-and-true-p whitespace-mode)  ; in case user disabled it
+                 (gethash 'indent_style props))
+        (+whitespace-highlight-incorrect-indentation-h))))
+
   :config
   (setq whitespace-line-column nil
         whitespace-style