diff --git a/lua/opencode/state/store.lua b/lua/opencode/state/store.lua
index d2b93988..b2e3f63f 100644
--- a/lua/opencode/state/store.lua
+++ b/lua/opencode/state/store.lua
@@ -210,7 +210,7 @@ function M.mutate(key, mutator)
   end
 
   local current = _state[key]
-  local old = vim.deepcopy(current)
+  local old = vim.tbl_extend('force', {}, current)
   mutator(current)
   queue_emit(key, current, old)
   return current