diff --git a/web/src/components/Timeline.vue b/web/src/components/Timeline.vue
index 41e1274..0099c03 100644
--- a/web/src/components/Timeline.vue
+++ b/web/src/components/Timeline.vue
@@ -203,4 +203,4 @@ a {
 }
 
 
-</style>
\ No newline at end of file
+</style>
diff --git a/web/src/components/inputs/AsyncButton.vue b/web/src/components/inputs/AsyncButton.vue
index 833f964..6ae298f 100644
--- a/web/src/components/inputs/AsyncButton.vue
+++ b/web/src/components/inputs/AsyncButton.vue
@@ -1,9 +1,9 @@
 <template>
-    <button @click.stop="handleClick" :disabled="disabled">
+    <button @click.stop="handleClick" :disabled="disabled || inProgress">
         <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"
-              :class="{'d-none': !disabled}"></span>
-        <span class="ml-2" :class="{'d-none': !disabled}">In Progress...</span>
-        <span :class="{'d-none': disabled}"><slot></slot></span>
+              :class="{'d-none': !inProgress}"></span>
+        <span class="ml-2" :class="{'d-none': !inProgress}">In Progress...</span>
+        <span :class="{'d-none': inProgress}"><slot></slot></span>
     </button>
 </template>
 
@@ -13,7 +13,7 @@ export default {
     name: 'AsyncButton',
     data() {
         return {
-            disabled: false,
+            inProgress: false,
         };
     },
     props: {
@@ -21,17 +21,21 @@ export default {
             type: Function,
             required: true,
         },
+		disabled: {
+			type: Boolean,
+			required: false,
+		},
     },
     methods: {
         async handleClick() {
             if (this.task && typeof this.task === 'function') {
-                this.disabled = true;
+                this.inProgress = true;
                 try {
                     await this.task();
                 } catch (e) {
                     console.error(e);
                 } finally {
-                    this.disabled = false;
+                    this.inProgress = false;
                 }
             }
         },
@@ -43,4 +47,4 @@ export default {
 .spinner-border {
     vertical-align: -0.125em;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue
index dd0b413..4921a74 100644
--- a/web/src/views/Ticket.vue
+++ b/web/src/views/Ticket.vue
@@ -17,7 +17,7 @@
                                         <textarea placeholder="add comment..." v-model="newComment"
                                                   class="form-control">
                                         </textarea>
-                                        <AsyncButton class="btn btn-primary float-right" :task="addCommentAndClear">
+                                        <AsyncButton class="btn btn-primary float-right" :task="addCommentAndClear" :disabled="!newComment">
                                             <font-awesome-icon icon="comment"/>
                                             Save Comment
                                         </AsyncButton>