diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 187b572e82..bda4df73f3 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1780,7 +1780,7 @@ Lua module: vim.lsp.client                                        *lsp-client*
       • {is_stopped}            (`fun(self: vim.lsp.Client): boolean`) See
                                 |Client:is_stopped()|.
       • {name}                  (`string`) See |vim.lsp.ClientConfig|.
-      • {notify}                (`fun(self: vim.lsp.Client, method: string, params: table?): boolean`)
+      • {notify}                (`fun(self: vim.lsp.Client, method: string, params: table?, bufnr: integer?): boolean`)
                                 See |Client:notify()|.
       • {offset_encoding}       (`'utf-8'|'utf-16'|'utf-32'`) See
                                 |vim.lsp.ClientConfig|.
@@ -2015,12 +2015,13 @@ Client:is_stopped()                                      *Client:is_stopped()*
         (`boolean`) true if client is stopped or in the process of being
         stopped; false otherwise
 
-Client:notify({method}, {params})                            *Client:notify()*
+Client:notify({method}, {params}, {bufnr})                   *Client:notify()*
     Sends a notification to an LSP server.
 
     Parameters: ~
       • {method}  (`string`) LSP method name.
       • {params}  (`table?`) LSP request params.
+      • {bufnr}   (`integer?`) Buffer associated with notification.
 
     Return: ~
         (`boolean`) status indicating if the notification was successful. If
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 6e989cfc52..0d787fa9fd 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -919,7 +919,7 @@ local function buf_attach(bufnr)
         reason = protocol.TextDocumentSaveReason.Manual, ---@type integer
       }
       if client:supports_method('textDocument/willSave') then
-        client:notify('textDocument/willSave', params)
+        client:notify('textDocument/willSave', params, bufnr)
       end
       if client:supports_method('textDocument/willSaveWaitUntil') then
         local result, err =
@@ -955,7 +955,7 @@ local function buf_attach(bufnr)
       for _, client in ipairs(clients) do
         changetracking.reset_buf(client, bufnr)
         if client:supports_method('textDocument/didClose') then
-          client:notify('textDocument/didClose', params)
+          client:notify('textDocument/didClose', params, bufnr)
         end
       end
       for _, client in ipairs(clients) do
diff --git a/runtime/lua/vim/lsp/_changetracking.lua b/runtime/lua/vim/lsp/_changetracking.lua
index 1e9f3f0c46..11055affcd 100644
--- a/runtime/lua/vim/lsp/_changetracking.lua
+++ b/runtime/lua/vim/lsp/_changetracking.lua
@@ -193,7 +193,7 @@ function M._send_did_save(bufnr)
           textDocument = {
             uri = vim.uri_from_fname(old_name),
           },
-        })
+        }, bufnr)
         client:notify('textDocument/didOpen', {
           textDocument = {
             version = 0,
@@ -201,7 +201,7 @@ function M._send_did_save(bufnr)
             languageId = client.get_language_id(bufnr, vim.bo[bufnr].filetype),
             text = vim.lsp._buf_get_full_text(bufnr),
           },
-        })
+        }, bufnr)
         util.buf_versions[bufnr] = 0
       end
       local save_capability = vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'save')
@@ -215,7 +215,7 @@ function M._send_did_save(bufnr)
             uri = uri,
           },
           text = included_text,
-        })
+        }, bufnr)
       else
         M.flush(client, bufnr)
       end
@@ -329,7 +329,7 @@ local function send_changes(bufnr, sync_kind, state, buf_state)
           version = util.buf_versions[bufnr],
         },
         contentChanges = changes,
-      })
+      }, bufnr)
     end
   end
 end
diff --git a/runtime/lua/vim/lsp/client.lua b/runtime/lua/vim/lsp/client.lua
index 79c5e3c957..0297c02c3d 100644
--- a/runtime/lua/vim/lsp/client.lua
+++ b/runtime/lua/vim/lsp/client.lua
@@ -847,9 +847,10 @@ end
 ---
 --- @param method vim.lsp.protocol.Method.ClientToServer.Notification LSP method name.
 --- @param params table? LSP request params.
+--- @param bufnr integer? Buffer associated with notification.
 --- @return boolean status indicating if the notification was successful.
 ---                        If it is false, then the client has shutdown.
-function Client:notify(method, params)
+function Client:notify(method, params, bufnr)
   if method ~= 'textDocument/didChange' then
     changetracking.flush(self)
   end
@@ -857,16 +858,15 @@ function Client:notify(method, params)
   local client_active = self.rpc.notify(method, params)
 
   if client_active then
-    vim.schedule(function()
-      api.nvim_exec_autocmds('LspNotify', {
-        modeline = false,
-        data = {
-          client_id = self.id,
-          method = method,
-          params = params,
-        },
-      })
-    end)
+    api.nvim_exec_autocmds('LspNotify', {
+      buf = bufnr,
+      modeline = false,
+      data = {
+        client_id = self.id,
+        method = method,
+        params = params,
+      },
+    })
   end
 
   return client_active
@@ -1137,14 +1137,14 @@ end
 
 --- Default handler for the 'textDocument/didClose' LSP notification.
 ---
---- @param buf integer Number of the buffer, or 0 for current
-function Client:_text_document_did_close_handler(buf)
+--- @param bufnr integer Number of the buffer, or 0 for current
+function Client:_text_document_did_close_handler(bufnr)
   if not self:supports_method('textDocument/didClose') then
     return
   end
-  local uri = vim.uri_from_bufnr(buf)
+  local uri = vim.uri_from_bufnr(bufnr)
   local params = { textDocument = { uri = uri } }
-  self:notify('textDocument/didClose', params)
+  self:notify('textDocument/didClose', params, bufnr)
 end
 
 --- Default handler for the 'textDocument/didOpen' LSP notification.
@@ -1166,7 +1166,7 @@ function Client:_text_document_did_open_handler(bufnr)
       languageId = self:_get_language_id(bufnr),
       text = lsp._buf_get_full_text(bufnr),
     },
-  })
+  }, bufnr)
 
   -- Next chance we get, we should re-do the diagnostics
   vim.schedule(function()
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 38b7164ee3..50898b62fc 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -242,10 +242,6 @@ function STHighlighter:on_attach(client_id)
     end
   end)
 
-  nvim_on({ 'BufWinEnter', 'InsertLeave' }, self.augroup, { buf = self.bufnr }, function()
-    self:send_request()
-  end)
-
   if state.supports_range then
     nvim_on('WinScrolled', self.augroup, { buf = self.bufnr }, function()
       self:debounce_request()
@@ -802,7 +798,7 @@ function M.start(bufnr, client_id, opts)
 
   M.enable(true, { bufnr = bufnr, client_id = client_id })
 
-  if opts and opts.debounce then
+  if opts and opts.debounce and STHighlighter.active[bufnr] then
     local highlighter = STHighlighter.active[bufnr]
     local prev = rawget(highlighter, 'debounce')
     highlighter.debounce = prev and math.max(prev, opts.debounce) or opts.debounce
diff --git a/test/functional/plugin/lsp/semantic_tokens_spec.lua b/test/functional/plugin/lsp/semantic_tokens_spec.lua
index 3c705532c0..dabffcd639 100644
--- a/test/functional/plugin/lsp/semantic_tokens_spec.lua
+++ b/test/functional/plugin/lsp/semantic_tokens_spec.lua
@@ -311,6 +311,7 @@ describe('semantic token highlighting', function()
       exec_lua(function()
         _G.server_full = _G._create_server({
           capabilities = {
+            textDocumentSync = vim.lsp.protocol.TextDocumentSyncKind.Full,
             semanticTokensProvider = {
               full = { delta = false },
               range = true,