diff --git a/core/core-editor.el b/core/core-editor.el
index 2a274cbc6..1cac1f8f1 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -152,6 +152,11 @@ fundamental-mode) for performance sake."
   :config
   (add-hook 'doom-init-hook #'editorconfig-mode)
 
+  ;; Editorconfig makes indentation weird in Lisp modes, so we disable it. It
+  ;; still applies other project settings (e.g. tabs vs spaces) though.
+  (set! :editorconfig :remove 'emacs-lisp-mode)
+  (set! :editorconfig :remove 'lisp-mode)
+
   (defun doom|editorconfig-whitespace-mode-maybe (&rest _)
     "Show whitespace-mode when file uses TABS (ew)."
     (if indent-tabs-mode (whitespace-mode +1)))
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 3dda79a8e..b6453040e 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -16,9 +16,6 @@
                    ("add-hook" "remove-hook")
                    ("add-hook!" "remove-hook!")))
 
-  ;; Don't affect lisp indentation (only `tab-width')
-  (set! :editorconfig :remove 'emacs-lisp-mode)
-
   (defun +emacs-lisp|hook ()
     (add-hook 'before-save-hook #'delete-trailing-whitespace nil t)