diff --git a/after/plugin/bcr.lua b/after/plugin/bcr.lua
index 33c4544..dd82896 100644
--- a/after/plugin/bcr.lua
+++ b/after/plugin/bcr.lua
@@ -1,5 +1,5 @@
 vim.api.nvim_create_augroup('_bcr', { clear = true })
-vim.api.nvim_create_autocmd('BufRead,BufNewFile', {
+vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
   pattern = '*/frontend-apps/*/bcr/core/public/*',
   callback = function()
     vim.cmd [[
@@ -12,7 +12,7 @@ vim.api.nvim_create_autocmd('BufRead,BufNewFile', {
   end,
   group = '_bcr',
 })
-vim.api.nvim_create_autocmd('BufRead,BufNewFile', {
+vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
   pattern = '*/frontend-apps/*/bcr/*',
   callback = function()
     vim.g.rooter_patterns = { '=bcr' }
@@ -22,10 +22,9 @@ vim.api.nvim_create_autocmd('BufRead,BufNewFile', {
 vim.api.nvim_create_autocmd('LspAttach', {
   pattern = { '*/frontend-apps/*/bcr/*.[jt]s', '*/frontend-apps/*/bcr/*.[jt]sx', '*/frontend-apps/*/bcr/*.json' },
   callback = function(opts)
-    local bufnr = opts.buf
     local client = vim.lsp.get_client_by_id(opts.data.client_id)
 
-    if client.name ~= 'tsserver' then
+    if not client or client.name ~= 'tsserver' then
       return
     end
   end,