diff --git a/plugins/nvim-lsp/default.nix b/plugins/nvim-lsp/default.nix
index 32d70cea..8949510d 100644
--- a/plugins/nvim-lsp/default.nix
+++ b/plugins/nvim-lsp/default.nix
@@ -82,6 +82,13 @@ in
               require('lspconfig')[server].setup(__setup)
             else
               local options = ${runWrappers cfg.setupWrappers "server.extraOptions"}
+
+              if options == nil then
+                options = __setup
+              else
+                options = vim.tbl_extend("keep", options, __setup)
+              end
+
               require('lspconfig')[server.name].setup(options)
             end
           end
diff --git a/tests/flake.lock b/tests/flake.lock
index 4caea77c..3b224d8c 100644
--- a/tests/flake.lock
+++ b/tests/flake.lock
@@ -97,12 +97,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-NLfZri8QaYVDjLHfDAqP+DHyIRsb+bXn+2dJtoFo1LM=",
-        "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source",
+        "narHash": "sha256-FTGR/AeBEZQeWqSQqbnR+3oW4NJvhwshJu8/mHDWwQ8=",
+        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source",
+        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
         "type": "path"
       }
     },
@@ -116,12 +116,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-NLfZri8QaYVDjLHfDAqP+DHyIRsb+bXn+2dJtoFo1LM=",
-        "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source",
+        "narHash": "sha256-FTGR/AeBEZQeWqSQqbnR+3oW4NJvhwshJu8/mHDWwQ8=",
+        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source",
+        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
         "type": "path"
       }
     },