diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 682f222e6c..8b2d3dc0ad 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1132,9 +1132,25 @@ api.nvim_create_autocmd('VimLeavePre', {
     local active_clients = lsp.get_clients()
     log.info('exit_handler', active_clients)
 
+    local max_timeout = 0
     for _, client in pairs(active_clients) do
+      max_timeout = math.max(max_timeout, tonumber(client.exit_timeout) or 0)
       client:stop(client.exit_timeout)
     end
+    if max_timeout > 10 then
+      api.nvim_echo({
+        {
+          string.format('Waiting %ss for lsp exit (Press Ctrl-C to force exit)', max_timeout / 1e3),
+          'WarningMsg',
+        },
+      }, true, {})
+    end
+
+    vim.wait(max_timeout, function()
+      return vim.iter(active_clients):all(function(client)
+        return client.rpc.is_closing()
+      end)
+    end)
   end,
 })