diff --git a/runtime/lua/vim/_extui/cmdline.lua b/runtime/lua/vim/_extui/cmdline.lua
index f58ebb5910..3a2b929598 100644
--- a/runtime/lua/vim/_extui/cmdline.lua
+++ b/runtime/lua/vim/_extui/cmdline.lua
@@ -63,7 +63,7 @@ end
 ---@param hl_id integer
 function M.cmdline_show(content, pos, firstc, prompt, indent, level, hl_id)
   M.level, M.indent, M.prompt = level, indent, M.prompt or #prompt > 0
-  if M.highlighter == nil then
+  if M.highlighter == nil or M.highlighter.bufnr ~= ext.bufs.cmd then
     local parser = assert(vim.treesitter.get_parser(ext.bufs.cmd, 'vim', {}))
     M.highlighter = vim.treesitter.highlighter.new(parser)
   end
diff --git a/test/functional/ui/cmdline2_spec.lua b/test/functional/ui/cmdline2_spec.lua
index 125bf8a34f..3383f3d322 100644
--- a/test/functional/ui/cmdline2_spec.lua
+++ b/test/functional/ui/cmdline2_spec.lua
@@ -97,4 +97,13 @@ describe('cmdline2', function()
       ^                                                     |
     ]])
   end)
+
+  it('highlights after deleting buffer', function()
+    feed(':%bw!<CR>:call foo()')
+    screen:expect([[
+                                                           |
+      {1:~                                                    }|*12
+      {16::}{15:call} {25:foo}{16:()}^                                          |
+    ]])
+  end)
 end)