diff --git a/modules/home-manager/cli/neovim/files/lspconfig.lua b/modules/home-manager/cli/neovim/files/lspconfig.lua
index a672376..8cfd4ba 100644
--- a/modules/home-manager/cli/neovim/files/lspconfig.lua
+++ b/modules/home-manager/cli/neovim/files/lspconfig.lua
@@ -229,7 +229,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
     -- Move to the next diagnostic
     bufmap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
     local client = vim.lsp.get_client_by_id(ev.data.client_id)
-    if client.name == "yamlls" then
+    if client and (client.name == "yamlls" or client.name == "helm_ls") then
       bufmap ('n', '<F3>', '<cmd>lua require("yaml-companion").open_ui_select()<cr>')
     end
   end