diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 0221e3d2..b50b44df 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -22,7 +22,7 @@
   "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
   "nvim-dap": { "branch": "master", "commit": "40a8189b8a57664a1850b0823fdcb3ac95b9f635" },
   "nvim-jdtls": { "branch": "master", "commit": "4d77ff02063cf88963d5cf10683ab1fd15d072de" },
-  "nvim-lspconfig": { "branch": "master", "commit": "463b16bd6a347a129367a7fd00ebcdd9442d9a96" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b8c3630ce37dfbe51910b68785a71620b072c41a" },
   "nvim-metals": { "branch": "main", "commit": "852b8aa60d8ca30e14ef9253ced91656e845cfb7" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
diff --git a/.config/nvim/plugin/lsp.lua b/.config/nvim/plugin/lsp.lua
index 265c2c42..d8cca152 100644
--- a/.config/nvim/plugin/lsp.lua
+++ b/.config/nvim/plugin/lsp.lua
@@ -91,12 +91,14 @@ vim.lsp.set_log_level("off")
 -- It is not recommended to break lspconfig into different settings
 -- related: https://github.com/neovim/nvim-lspconfig/issues/970#issuecomment-860080502
 for name, user_config in pairs(servers) do
-    local default_config = {
-        capabilities = mylsp.capabilities,
-        settings = user_config,
-        on_attach = function(client, bufno) mylsp.on_attach(client, bufno) end,
-    }
-    local merged_config = vim.tbl_deep_extend("force", default_config, user_config)
-
-    require("lspconfig")[name].setup(merged_config)
+    if next(user_config) ~= nil then
+        local default_config = {
+            capabilities = mylsp.capabilities,
+            settings = user_config,
+            on_attach = function(client, bufno) mylsp.on_attach(client, bufno) end,
+        }
+        local merged_config = vim.tbl_deep_extend("force", default_config, user_config)
+        vim.lsp.config(name, merged_config)
+    end
+    vim.lsp.enable(name)
 end