diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index 9cde1d7..6c776cd 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -58,7 +58,8 @@
 					<Z-files-upload class="mt-15 files" :files="subtask.files" @files-uploaded="filesUploaded" />
 				</v-card-actions>
 
-				<v-btn class="button primary" @click="save()">{{ subtask.id ? "UPRAVIŤ" : "VYTVORIŤ" }}</v-btn>
+				<v-btn class="button primary" v-if="!isSaving" @click="save()">{{ subtask.id ? "UPRAVIŤ" : "VYTVORIŤ" }}</v-btn>
+				<v-btn class="button primary disabled" v-else disabled>{{ $t('Ukladám...')}}</v-btn>
 			</v-card>
 
 			<v-card v-else height="100%" class="d-flex flex-column scrolling">
@@ -138,6 +139,7 @@ export default {
 			editMode: false,
 			visible: false,
 			subtask: null,
+			isSaving: false,
 			errorUtils,
 			v$: useVuelidate(),
 			employeeValidations: [],
@@ -188,6 +190,7 @@ export default {
 
 	methods: {
 		async showModal({subtask, editMode = false, mastertask = {}}) {
+			this.isSaving = false
 			this.subtask = null
 			this.visible = true
 			this.$nextTick(() => this.v$.$reset())
@@ -233,6 +236,7 @@ export default {
 			this._mergeDeadlineTimeDate()
 
 			try {
+				this.isSaving = true
 				this.subtask.deadline = moment(this.subtask.deadline).format('YYYY-MM-DD HH:mm:SS')
 
 				if (this.subtask?.id) {
@@ -259,6 +263,8 @@ export default {
 			} catch (error) {
 				console.error(error)
 				this.$toast.error(error)
+			} finally {
+				this.isSaving = true
 			}
 		},