diff --git a/apps/todo/apps/web/src/lib/components/TaskItem.svelte b/apps/todo/apps/web/src/lib/components/TaskItem.svelte
index 03edac64f..208128768 100644
--- a/apps/todo/apps/web/src/lib/components/TaskItem.svelte
+++ b/apps/todo/apps/web/src/lib/components/TaskItem.svelte
@@ -209,7 +209,8 @@
 
 	function toggleSubtask(subtaskId: string) {
 		if (!onSave) return;
-		const updated = (task.subtasks ?? []).map((s) =>
+		const subtasks = $state.snapshot(task.subtasks) ?? [];
+		const updated = subtasks.map((s) =>
 			s.id === subtaskId
 				? {
 						...s,
diff --git a/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte b/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte
index 50fabe94b..0131de47f 100644
--- a/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte
+++ b/apps/todo/apps/web/src/lib/components/kanban/KanbanTaskCard.svelte
@@ -153,7 +153,8 @@
 
 	function toggleSubtask(subtaskId: string) {
 		if (!onSave) return;
-		const updated = (task.subtasks ?? []).map((s) =>
+		const subtasks = $state.snapshot(task.subtasks) ?? [];
+		const updated = subtasks.map((s) =>
 			s.id === subtaskId
 				? {
 						...s,