diff --git a/app/components/todo/Todo.vue b/app/components/todo/Todo.vue
index fc031ca..618a0f4 100644
--- a/app/components/todo/Todo.vue
+++ b/app/components/todo/Todo.vue
@@ -19,18 +19,37 @@
 	const checked = ref(isChecked(props.data));
 	const todoStore = useTodoStore();
 
-	function onCheck() {
-		checked.value = true;
-
+	function onClickCheck() {
 		if (props.data.time?.type === "recurring") {
-			todoStore.checkTodo(props.data.uuid);
+			if (checked.value) {
+				uncheck();
+			} else {
+				check();
+			}
 		} else {
-			setTimeout(() => {
-				todoStore.removeTodo(props.data.uuid);
-			}, 1000);
+			if (!checked.value) {
+				remove();
+			}
 		}
 	}
 
+	function remove() {
+		checked.value = true;
+		setTimeout(() => {
+			todoStore.removeTodo(props.data.uuid);
+		}, 1000);
+	}
+
+	function check() {
+		checked.value = true;
+		todoStore.checkTodo(props.data.uuid);
+	}
+
+	function uncheck() {
+		checked.value = false;
+		todoStore.uncheckTodo(props.data.uuid);
+	}
+
 	const { filter } = useFilter();
 	const tagStore = useTagStore();
 	const categoryStore = useCategoryStore();
@@ -80,12 +99,7 @@
 <template>
 	<div data-testid="todo" class="relative flex flex-col justify-center">
 		<div class="flex items-center gap-1 pt-2 pb-1">
-			<button
-				type="button"
-				class="cursor-pointer"
-				:disabled="checked"
-				@click="onCheck()"
-			>
+			<button type="button" class="cursor-pointer" @click="onClickCheck()">
 				<div
 					:data-isRecurring="isRecurring"
 					class="border-secondary m-1 flex h-8 w-8 items-center justify-center rounded-xl border-2 transition-all  data-[isRecurring=true]:rounded-full"
@@ -97,6 +111,7 @@
 					<transition
 						class="transition-opacity duration-500"
 						enter-from-class="opacity-0"
+						leave-to-class="opacity-0"
 					>
 						<icon
 							v-if="checked"
diff --git a/app/stores/useTodoStore.ts b/app/stores/useTodoStore.ts
index 407d8e6..0564ed3 100644
--- a/app/stores/useTodoStore.ts
+++ b/app/stores/useTodoStore.ts
@@ -144,6 +144,24 @@ export const useTodoStore = defineStore("todos", {
 			});
 		},
 
+		async uncheckTodo(uuid: UUID) {
+			const index = this.data.findIndex((value) => value.uuid === uuid);
+			const todo = this.data[index]!;
+			todo.checks.pop();
+
+			this.data[index] = todo;
+
+			const fetch = useRequestFetch();
+			await fetch(`/api/todos/check/${uuid}`, {
+				method: "DELETE",
+				...useFetchOptions(),
+			}).catch(async (err) => {
+				//todo - show in toast
+				console.warn(err);
+				await this.fetch();
+			});
+		},
+
 		async moveTodo(toMove: UUID, to: UUID) {
 			const dropIndex = this.data.findIndex((todo) => todo.uuid === to);
 			const dragIndex = this.data.findIndex((todo) => todo.uuid === toMove);
diff --git a/server/api/todos/check/[uuid].delete.ts b/server/api/todos/check/[uuid].delete.ts
new file mode 100644
index 0000000..a928945
--- /dev/null
+++ b/server/api/todos/check/[uuid].delete.ts
@@ -0,0 +1,20 @@
+import type { Todo, UUID } from "~~/shared/types";
+
+export default defineAuthenticatedEventHandler(
+	async (event, userId): Promise<Todo> => {
+		const uuid: UUID | undefined = getRouterParam(event, "uuid");
+
+		if (!uuid)
+			throw createError({
+				status: 400,
+				statusMessage: "Bad Request",
+				message: `no uuid set - uuid:'${uuid}'`,
+			});
+
+		const todo = await Todos.uncheck(userId, uuid);
+		if (todo instanceof Error) throw todo;
+
+		TodoEventStream.sendUpdate(userId);
+		return todo;
+	},
+);
diff --git a/server/utils/db/todos.ts b/server/utils/db/todos.ts
index 6b7d2d4..24c85bb 100644
--- a/server/utils/db/todos.ts
+++ b/server/utils/db/todos.ts
@@ -89,4 +89,23 @@ export const Todos = {
 
 		return todo;
 	},
+
+	async uncheck(userId: string, uuid: UUID): Promise<Todo | NuxtError> {
+		const storage = useStorage();
+		const todos = await Todos.getAll(userId);
+
+		const index = todos.findIndex((value) => value.uuid === uuid);
+		if (index === -1)
+			return createError({
+				status: 404,
+				statusMessage: "Not Found",
+				message: `Todo with with uuid ${uuid} not found`,
+			});
+
+		const todo = todos[index]!;
+		todo.checks.pop();
+		await storage.set(getKey(userId), todos);
+
+		return todo;
+	},
 };