diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el
index d0658a5f1..13278cfe6 100644
--- a/modules/editor/format/config.el
+++ b/modules/editor/format/config.el
@@ -44,6 +44,8 @@ This is controlled by `+format-on-save-disabled-modes'."
   (add-to-list 'doom-debug-variables '(apheleia-log-only-errors . nil))
   (add-to-list 'doom-debug-variables '(apheleia-log-debug-info . t))
 
+  (add-to-list 'apheleia-mode-alist '(sh-mode . shfmt))
+
   ;; A psuedo-formatter that dispatches to the appropriate LSP client (via
   ;; `lsp-mode' or `eglot') that is capable of formatting. Without +lsp, users
   ;; must manually set `+format-with' to `lsp' to use it, or activate
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index 7355b7ac3..7f2ba3774 100755
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -18,10 +18,6 @@
   :config
   (set-docsets! 'sh-mode "Bash")
   (set-electric! 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
-  (set-formatter! 'shfmt '("shfmt" "-ci"
-                           (unless indent-tabs-mode
-                             (list "-i" (number-to-string tab-width)))))
-
   (set-repl-handler! 'sh-mode #'+sh/open-repl)
   (set-lookup-handlers! 'sh-mode :documentation #'+sh-lookup-documentation-handler)
   (set-ligatures! 'sh-mode