diff --git a/lua/config/options.lua b/lua/config/options.lua
index aef93d3..a794a7d 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -13,6 +13,9 @@ vim.o.mouse = ""
 vim.o.mousescroll = "ver:0,hor:0"
 vim.o.writebackup = false
 vim.o.undofile = true
+vim.o.updatetime = 250
+vim.o.timeout = true
+vim.o.timeoutlen = 300
 
 -- ui
 vim.o.breakindent = true
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 71052e6..4c92ec7 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -58,6 +58,36 @@ MiniDeps.later(function()
                 "format"
             )
 
+            local tD_dH = vim.lsp.protocol.Methods.textDocument_documentHighlight
+            if client and client.supports_method(tD_dH) then
+                local ag = vim.api.nvim_create_augroup
+                local ac = vim.api.nvim_create_autocmd
+                local g = ag("custom-lsp-tD_dH-highlight", { clear = false })
+
+                ac({ "CursorHold", "CursorHoldI" }, {
+                    buffer = bufnr,
+                    group = g,
+                    callback = vim.lsp.buf.document_highlight,
+                })
+
+                ac({ "CursorMoved", "CursorMovedI" }, {
+                    buffer = bufnr,
+                    group = g,
+                    callback = vim.lsp.buf.clear_references,
+                })
+
+                ac("LspDetach", {
+                    group = ag("custom-lsp-detach", { clear = true }),
+                    callback = function(e)
+                        vim.lsp.buf.clear_references()
+                        vim.api.nvim_clear_autocmds({
+                            group = "custom-lsp-tD_dH-highlight",
+                            buffer = e.buf,
+                        })
+                    end,
+                })
+            end
+
             -- inlay hints
             if client and client.server_capabilities.inlayHintProvider then
                 vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })