diff --git a/src/app/components/shared/comment/comment.component.ts b/src/app/components/shared/comment/comment.component.ts
index b9f315b9591c01e23adbd190345e8020aeb4a949..af94965e14b59c25f2858027bf2a04d355d2555c 100644
--- a/src/app/components/shared/comment/comment.component.ts
+++ b/src/app/components/shared/comment/comment.component.ts
@@ -95,6 +95,10 @@ export class CommentComponent implements OnInit {
     if (this.hasVoted !== 1) {
       this.wsCommentService.voteUp(comment, userId);
       this.hasVoted = 1;
+    } else {
+      this.wsCommentService.resetVote(comment, userId);
+      this.hasVoted = 0;
+      this.startAnimation(0);
     }
   }
 
@@ -103,6 +107,10 @@ export class CommentComponent implements OnInit {
     if (this.hasVoted !== -1) {
       this.wsCommentService.voteDown(comment, userId);
       this.hasVoted = -1;
+    } else {
+      this.wsCommentService.resetVote(comment, userId);
+      this.hasVoted = 0;
+      this.startAnimation(0);
     }
   }
 
diff --git a/src/app/models/messages/reset-vote.ts b/src/app/models/messages/reset-vote.ts
new file mode 100644
index 0000000000000000000000000000000000000000..99c327e6e935f2e71cb32b35806ca08c5ab3529c
--- /dev/null
+++ b/src/app/models/messages/reset-vote.ts
@@ -0,0 +1,15 @@
+export class ResetVote {
+  type: string;
+  payload: {
+    userId: string;
+    commentId: string;
+  };
+
+  constructor(userId: string, commentId: string) {
+    this.type = 'ResetVote';
+    this.payload = {
+      userId: userId,
+      commentId: commentId
+    };
+  }
+}
diff --git a/src/app/services/websockets/ws-comment-service.service.ts b/src/app/services/websockets/ws-comment-service.service.ts
index 43f47fd68b5d1a206bf8dd8ea8e303586c5a9865..381d45f072d84ce17cd2981759d7472811687d19 100644
--- a/src/app/services/websockets/ws-comment-service.service.ts
+++ b/src/app/services/websockets/ws-comment-service.service.ts
@@ -7,6 +7,7 @@ import { HighlightComment } from '../../models/messages/highlight-comment';
 import { TSMap } from 'typescript-map';
 import { UpVote } from '../../models/messages/up-vote';
 import { DownVote } from '../../models/messages/down-vote';
+import { ResetVote } from '../../models/messages/reset-vote';
 import { Observable } from 'rxjs';
 import { IMessage } from '@stomp/stompjs';
 
@@ -58,6 +59,11 @@ export class WsCommentServiceService {
     this.wsConnector.send(`/queue/vote.command.downvote`, JSON.stringify(message));
   }
 
+  resetVote(comment: Comment, userId: string): void {
+    const message = new ResetVote(userId, comment.id);
+    this.wsConnector.send(`/queue/vote.command.resetvote`, JSON.stringify(message));
+  }
+
   private patchComment(comment: Comment, changes: TSMap<string, any>): void {
     const message = new PatchComment(comment.id, changes);
     this.wsConnector.send(`/queue/comment.command.patch`, JSON.stringify(message));