diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el
index 3e1ae65..7ed1d60 100644
--- a/modules/languages/siren-rust.el
+++ b/modules/languages/siren-rust.el
@@ -26,7 +26,6 @@
     (setq-local rust-format-on-save t)
 
     (tree-sitter-mode t)
-    (lsp-deferred)
     (origami-mode t)
     (subword-mode t))
 
@@ -35,6 +34,18 @@
     (add-to-list 'origami-parser-alist
                  '(rust-mode . origami-c-style-parser))))
 
+(use-package lsp-rust
+  :straight lsp-mode
+
+  :hook
+  (rust-mode . siren-lsp-rust-mode-setup)
+
+  :preface
+   (defun siren-lsp-rust-mode-setup ()
+    (lsp-format-buffer-on-save-mode t)
+    (lsp-organize-imports-on-save-mode t)
+    (lsp-deferred)))
+
 (use-package cargo
   :hook (rust-mode . cargo-minor-mode))