diff --git a/modules/lang/fsharp/config.el b/modules/lang/fsharp/config.el
index 071585737..add86a227 100644
--- a/modules/lang/fsharp/config.el
+++ b/modules/lang/fsharp/config.el
@@ -4,7 +4,6 @@
   (if (featurep! +lsp)
       (progn
         (setq fsharp-ac-intellisense-enabled nil)
-        (setq lsp-fsharp-server-install-dir (concat doom-etc-dir "fsautocomplete/"))
         (add-hook 'fsharp-mode-local-vars-hook #'lsp!))
     (setq fsharp-ac-use-popup nil) ; Use a buffer for docs rather than a pop-up
     (set-lookup-handlers! 'fsharp-mode :async t :definition #'fsharp-ac/gotodefn-at-point)
diff --git a/modules/tools/lsp/config.el b/modules/tools/lsp/config.el
index 89c3434e0..f051c6806 100644
--- a/modules/tools/lsp/config.el
+++ b/modules/tools/lsp/config.el
@@ -7,14 +7,25 @@ This can be a single company backend or a list thereof. It can be anything
 `company-backends' will accept.")
 
 
-(setq lsp-session-file (concat doom-etc-dir "lsp-session")
-      lsp-auto-guess-root t
-      lsp-keep-workspace-alive nil
-      lsp-groovy-server-install-dir (concat doom-etc-dir "lsp-groovy/")
-      lsp-intelephense-storage-path (concat doom-cache-dir "lsp-intelephense/"))
+;;
+;;; Packages
 
+(use-package! lsp-mode
+  :defer t
+  :init
+  (setq lsp-session-file (concat doom-etc-dir "lsp-session"))
+  ;; Don't prompt the user for the project root every time we open a new
+  ;; lsp-worthy file, instead, try to guess it with projectile.
+  (setq lsp-auto-guess-root t)
+  ;; Auto-kill LSP server once you've killed the last buffer associated with its
+  ;; project.
+  (setq lsp-keep-workspace-alive nil)
+
+  :config
+  (setq lsp-fsharp-server-install-dir (concat doom-etc-dir "lsp-fsharp/")
+        lsp-groovy-server-install-dir (concat doom-etc-dir "lsp-groovy/")
+        lsp-intelephense-storage-path (concat doom-cache-dir "lsp-intelephense/"))
 
-(after! lsp-mode
   (set-lookup-handlers! 'lsp-mode :async t
     :documentation 'lsp-describe-thing-at-point
     :definition 'lsp-find-definition