diff --git a/modules/config/default/autoload/default.el b/modules/config/default/autoload/default.el
index 10837d9a9..59cee2edf 100644
--- a/modules/config/default/autoload/default.el
+++ b/modules/config/default/autoload/default.el
@@ -36,17 +36,6 @@ If ARG (universal argument), runs `compile' from the current directory."
       (with-current-buffer buffer
         (funcall (default-value 'major-mode))))))
 
-;;;###autoload
-(defun +default/lsp-format-region-or-buffer ()
-  "Format the buffer (or selection) with LSP."
-  (interactive)
-  (unless (bound-and-true-p lsp-mode)
-    (user-error "Not in an LSP buffer"))
-  (call-interactively
-   (if (doom-region-active-p)
-       #'lsp-format-region
-     #'lsp-format-buffer)))
-
 ;;;###autoload
 (defun +default/restart-server ()
   "Restart the Emacs server."
diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el
index 40ca96f73..9229c5a1c 100644
--- a/modules/editor/format/autoload/format.el
+++ b/modules/editor/format/autoload/format.el
@@ -220,7 +220,9 @@ is selected)."
   (interactive)
   (call-interactively
    (if (bound-and-true-p lsp-mode)
-       #'+default/lsp-format-region-or-buffer
+       (if (doom-region-active-p)
+           #'lsp-format-region
+         #'lsp-format-buffer)
      (if (use-region-p)
          #'+format/region
        #'+format/buffer))))