diff --git a/core/autoload/text.el b/core/autoload/text.el
index d2baa4f62..4be6739ba 100644
--- a/core/autoload/text.el
+++ b/core/autoload/text.el
@@ -181,7 +181,8 @@ Respects `require-final-newline'."
   (when (boundp 'evil-shift-width)
     (setq evil-shift-width width))
   (cond ((require 'editorconfig nil t)
-         (editorconfig-set-indentation nil width))
+         (let (editorconfig-lisp-use-default-indent)
+           (editorconfig-set-indentation nil width)))
         ((require 'dtrt-indent nil t)
          (when-let (var (nth 2 (assq major-mode dtrt-indent-hook-mapping-list)))
            (doom-log "Updated %s = %d" var width)
diff --git a/modules/tools/editorconfig/config.el b/modules/tools/editorconfig/config.el
index e200d9fc0..c44095eab 100644
--- a/modules/tools/editorconfig/config.el
+++ b/modules/tools/editorconfig/config.el
@@ -52,9 +52,7 @@ specified by editorconfig."
   ;; Editorconfig makes indentation too rigid in Lisp modes, so tell
   ;; editorconfig to ignore indentation there. The dynamic indentation support
   ;; built into Emacs is superior.
-  (dolist (mode '(emacs-lisp-mode lisp-mode))
-    (delq (assq mode editorconfig-indentation-alist)
-          editorconfig-indentation-alist))
+  (setq editorconfig-lisp-use-default-indent t)
 
   ;;
   (editorconfig-mode +1))