diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
index ca8b43b..e10aeab 100644
--- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
@@ -65,7 +65,7 @@
 					</div>
 				</div>
 
-				<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day'].includes(event.type)" class="custom-event-body colWidth h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLength(event) <= 9000000, 'mini-event' : getEventLength(event) <= 5400000, 'micro-event' : getEventLength(event) <= 3600000}" :style="{backgroundColor: event._timeblock_is_finished || event.subtask.is_finished ? '#dedfe0' : event.color || event.subtask.color}">
+				<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day'].includes(event.type)" class="custom-event-body colWidth h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLength(event) <= 9000000, 'mini-event' : getEventLength(event) <= 5400000, 'micro-event' : getEventLength(event) <= 3600000}" :style="{backgroundColor: event._timeblock_is_finished || event.subtask?.is_finished ? '#dedfe0' : event.color || event.subtask.color}">
 					<div class="event-content" :class="{'is-blocker': event.isBlocker}"> 
 						<template v-if="event.type == 'subtask'">
 							<small v-if="event.subtask.project_code" class="project-code">{{ event.subtask.project_code }}</small>
@@ -244,7 +244,7 @@ export default {
 			const subtask = event.subtask
 			const timeblock = subtask.timeblocks.find(originalTimeblock => originalTimeblock.id == event._timeblock_id)
 
-			timeblock.is_finished = timeblock.is_finished ? 0 : 1
+			timeblock.is_finished = timeblock?.is_finished ? 0 : 1
 
 			try {
 				const {data: newTimeblock} = await this.$axios.put_auth(`v1/timeblocks/${timeblock.id}`, timeblock)
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
index 6b4e7b0..f1df6e3 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
@@ -112,11 +112,14 @@ export default {
 			if (!subtask?.is_finished) { subtask.is_finished = 0 }
 
 			subtask.timeblocks.push({
+				end: tmUtils.formatDateTimeForBackend(end),
 				id: null,
-				start: tmUtils.formatDateTimeForBackend(start),
-				end: tmUtils.formatDateTimeForBackend(end)
+				is_finished: 0,
+				start: tmUtils.formatDateTimeForBackend(start)
 			})
 
+			subtask.deadline = tmUtils.formatDateTimeForBackend(subtask.deadline)
+
 			if (!subtask.id) {
 				this.$emit('update-unfinished-subtask', subtask)
 				this.closeModal()
@@ -175,6 +178,7 @@ export default {
 				this.closeModal()
 				this.$events.emit('on-subtask-edited', subtask)
 			} catch (error) {
+				console.error(error)
 				this.$toast.error(error.message || error)
 			}
 		},