diff --git a/config/nvim/lua/fschauen/plugins/lsp.lua b/config/nvim/lua/fschauen/plugins/lsp.lua
index c3053e8..a727868 100644
--- a/config/nvim/lua/fschauen/plugins/lsp.lua
+++ b/config/nvim/lua/fschauen/plugins/lsp.lua
@@ -105,14 +105,9 @@ return {
 
   config = function()
     local icons = require("fschauen.util.icons")
-    local defaults = {
-      capabilities = lsp_capabilities(),
-      handlers = lsp_handlers(),
-      on_attach = lsp_on_attach,
-      lsp_on_init = lsp_on_init,
-    }
 
     require("lspconfig.ui.windows").default_options = border
+
     require("mason").setup {
       ui = {
         border = border.border,
@@ -123,6 +118,7 @@ return {
         },
       },
     }
+
     require("mason-lspconfig").setup {
       ensure_installed = {
         "clangd",
@@ -132,8 +128,12 @@ return {
       },
       handlers = {
         function(server_name)
-          local opts = server_opts[server_name](defaults)
-          require("lspconfig")[server_name].setup(opts)
+          require("lspconfig")[server_name].setup(server_opts[server_name] {
+            capabilities = lsp_capabilities(),
+            handlers = lsp_handlers(),
+            on_attach = lsp_on_attach,
+            lsp_on_init = lsp_on_init,
+          })
         end,
       },
     }