diff --git a/nvim/.config/nvim/after/lsp/arduino.lua b/nvim/.config/nvim/after/lsp/arduino.lua
new file mode 100644
index 0000000..70ca6ab
--- /dev/null
+++ b/nvim/.config/nvim/after/lsp/arduino.lua
@@ -0,0 +1,3 @@
+return {
+	on_new_config = require("arduino").on_new_config,
+}
diff --git a/nvim/.config/nvim/lua/core/languages.lua b/nvim/.config/nvim/lua/core/languages.lua
index fb32cd4..8fa0595 100644
--- a/nvim/.config/nvim/lua/core/languages.lua
+++ b/nvim/.config/nvim/lua/core/languages.lua
@@ -26,7 +26,7 @@ local function mason_dir()
 end
 
 local languages = {
-	arduino = { lsp = { arduino_language_server = {} }, ts = { "arduino" } },
+	arduino = { lsp = { clangd = {}, arduino_language_server = { disable = true } }, ts = { "arduino" } },
 	awk = { ts = { "awk" }, format = { awk = { "gawk" } } },
 	astro = {
 		lsp = { astro = {} },
diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua
index 291cdb6..0fec760 100644
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp.lua
@@ -137,11 +137,9 @@ local lsp = {
 				end,
 			})
 
-			-- set up arduino with the help of arduino.nvim plugin
-			if require("core.util").is_available("arduino") then
-				register("arduino_language_server", {
-					on_new_config = require("arduino").on_new_config,
-				})
+			-- arduino lsp only works if arduino-cli is installed
+			if vim.fn.executable("arduino-cli") == 1 then
+				register("arduino_language_server")
 			end
 
 			if vim.lsp.is_enabled("vue_ls") then