diff --git a/modules/tools/lsp/config.el b/modules/tools/lsp/config.el
index ac335e2f5..a1df04f25 100644
--- a/modules/tools/lsp/config.el
+++ b/modules/tools/lsp/config.el
@@ -27,8 +27,9 @@ This can be a single company backend or a list thereof. It can be anything
         lsp-intelephense-storage-path (concat doom-cache-dir "lsp-intelephense/"))
 
   :config
-  (when (and lsp-auto-configure lsp-auto-require-clients)
-    (require 'lsp-clients))
+  (when lsp-auto-configure
+    (mapc (lambda (package) (require package nil t))
+          lsp-client-packages))
 
   (set-lookup-handlers! 'lsp-mode :async t
     :documentation 'lsp-describe-thing-at-point
diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el
index e451c3225..e2f449548 100644
--- a/modules/tools/lsp/packages.el
+++ b/modules/tools/lsp/packages.el
@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/lsp/packages.el
 
-(package! lsp-mode :pin "e7c7abf236")
-(package! lsp-ui :pin "6caacc8c93")
+(package! lsp-mode :pin "2fc0963a50")
+(package! lsp-ui :pin "e8200e3b72")
 (when (featurep! :completion company)
   (package! company-lsp :pin "f921ffa0cd"))
 (when (featurep! :completion ivy)