diff --git a/nvim/.config/nvim/lua/plugins/config/lsp.lua b/nvim/.config/nvim/lua/plugins/config/lsp.lua
index aa63460..e84244e 100644
--- a/nvim/.config/nvim/lua/plugins/config/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/config/lsp.lua
@@ -70,7 +70,9 @@ local function on_attach(client, bufnr)
 		{ buffer = bufnr, desc = "Next error" }
 	)
 
-	require("which-key").register({ ["<localleader>l"] = { name = "+language" } })
+	if require("core.util").is_available("which-key") then
+		require("which-key").register({ ["<localleader>l"] = { name = "+language" } })
+	end
 	map(
 		"n",
 		"<localleader>ld",
diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua
index b5414d1..cc24131 100644
--- a/nvim/.config/nvim/lua/plugins/git.lua
+++ b/nvim/.config/nvim/lua/plugins/git.lua
@@ -55,7 +55,9 @@ return {
 					end, { expr = true, desc = "Previous git hunk" })
 
 					-- Actions
-					require("which-key").register({ ["<localleader>h"] = { name = "+git" } })
+					if require("core.util").is_available("which-key") then
+						require("which-key").register({ ["<localleader>h"] = { name = "+git" } })
+					end
 					map({ "n", "v" }, "<localleader>hs", ":Gitsigns stage_hunk<CR>", { desc = "stage hunk" })
 					map({ "n", "v" }, "<localleader>hr", ":Gitsigns reset_hunk<CR>", { desc = "reset hunk" })
 					map("n", "<localleader>hS", gs.stage_buffer, { desc = "stage buffer" })