diff --git a/lua/codemp/workspace.lua b/lua/codemp/workspace.lua
index f8f8627..92db562 100644
--- a/lua/codemp/workspace.lua
+++ b/lua/codemp/workspace.lua
@@ -118,10 +118,11 @@ local function join(workspace)
 			if event.type == "leave" then
 				if buffers.users[event.value] ~= nil then
 					local buf_name = buffers.users[event.value]
-					if buf_name ~= nil then
-						vim.api.nvim_buf_clear_namespace(buffers.map_rev[buf_name], user_hl[event.value].ns, 0, -1)
-						buffers.users[event.value] = nil
+					local buf_id = buffers.map_rev[buf_name]
+					if buf_id ~= nil then
+						vim.api.nvim_buf_clear_namespace(buf_id, user_hl[event.value].ns, 0, -1)
 					end
+					buffers.users[event.value] = nil
 					user_hl[event.value] = nil
 				end
 			elseif event.type == "join" then