diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el
index 9ba0a0fed..2278e0ea5 100644
--- a/modules/editor/format/config.el
+++ b/modules/editor/format/config.el
@@ -44,7 +44,7 @@ This is controlled by `+format-on-save-enabled-modes'."
                      (memq major-mode (cdr +format-on-save-enabled-modes)))
                     ((not (memq major-mode +format-on-save-enabled-modes))))
               (not (require 'format-all nil t)))
-    (format-all-mode +1)))
+    (add-hook 'before-save-hook #'+format/buffer nil t)))
 
 (when (featurep! +onsave)
   (add-hook 'after-change-major-mode-hook #'+format-enable-on-save-maybe-h))