diff --git a/src/component/Comment/CommentForm.vue b/src/component/Comment/CommentForm.vue
index 1c6712cc16f0ebacbc05837b27db9707419b0429..4f02103e56650ed0bb1ec1c569ac3a0b87f1df8d 100644
--- a/src/component/Comment/CommentForm.vue
+++ b/src/component/Comment/CommentForm.vue
@@ -1,77 +1,72 @@
 <template>
-  <article class="media">
-    <div class="media-content">
-      <form @submit.prevent="onSubmit">
-        <b-field>
-          <b-input
-            v-model.lazy="commentText"
-            type="textarea"
-            maxlength="400"
-            :placeholder="$t('comment.placeholder')"
-            :disabled="isLoading"
-          ></b-input>
-        </b-field>
-        <nav class="level">
-          <div class="level-left">
-            <b-button
-              type="is-primary"
-              native-type="submit"
-              class="level-item"
-              :disabled="isLoading"
-            >
-              {{$t('comment.submit')}}
-            </b-button>
-          </div>
-        </nav>
-      </form>
-    </div>
-  </article>
+	<article class="media">
+		<div class="media-content">
+			<form @submit.prevent="onSubmit">
+				<b-field>
+					<b-input v-model.lazy="commentText" type="textarea" maxlength="400" :placeholder="$t('comment.placeholder')" :disabled="isLoading"></b-input>
+				</b-field>
+				<nav class="level">
+					<div class="level-left">
+						<b-button type="is-primary" native-type="submit" class="level-item" :disabled="isLoading">
+							{{$t('comment.submit')}}
+						</b-button>
+					</div>
+				</nav>
+			</form>
+		</div>
+	</article>
 </template>
 
 <script>
-import { pushComment } from '@/api/comment'
+	import { pushComment } from "@/api/comment";
 
-export default{
-    name: 'CommentForm',
-    data(){
-        return{
-            commentText: '',
-            isLoading: false
-        }
+export default {
+  name: "CommentForm",
+  data() {
+    return {
+      commentText: "",
+      isLoading: false,
+    };
+  },
+  props: {
+    slug: {
+      type: String,
+      default: null,
     },
-    props:{
-        slug:{
-            type: String,
-            default: null
-        }
+  },
+  methods: {
+    async pushComment() {
+      pushComment(commentText).then((response) => {
+        const { data } = response;
+        this.commentText = "";
+      });
     },
-    methods:{
-        async pushComment(){
-            pushComment(commentText).then(response =>{
-                const {data} = response
-                this.commentText = ''
-            })
-        },
 
-        async onSubmit(){
-            this.isLoading = true
-            try{
-                let postData = {}
-                console.log(this.commentText)
-                postData['content'] = this.commentText
-                postData['topic_id'] = this.slug
-                await pushComment(postData)
-                this.$emit('loadComment',this.slug)
-                this.$message.success(this.$t('comment.success'))
-            }catch(e){
-                this.$buefy.toast.open({
-                    message: this.$t('comment.failed', [e]),
-                    type: 'is-danger'
-                })
-            }finally{
-                this.isLoading = false
-            }
+    async onSubmit() {
+      this.isLoading = true;
+      try {
+        let postData = {};
+        console.log(this.commentText);
+        if(this.commentText != '') {
+          postData["content"] = this.commentText;
+          postData["topic_id"] = this.slug;
+          await pushComment(postData);
+          this.$emit("loadComment", this.slug);
+          this.$message.success(this.$t('comment.success'));
+          this.commentText = "";
         }
-    }
-}
+        else
+          alert("Comment text can't be empty");
+      } catch (e) {
+        this.$buefy.toast.open({
+          message:  this.$t('comment.failed', [e]),
+          type: "is-danger",
+        });
+      } finally {
+        this.isLoading = false;
+      }
+    },
+  },
+};
+
 </script>
\ No newline at end of file