diff --git a/src/app/components/participant/content-choice-participant/content-choice-participant.component.html b/src/app/components/participant/content-choice-participant/content-choice-participant.component.html
index 4aab33df0cc83f0b4b22cac96fb230f9cb0ad326..ca39b17b5b3d80ee6d0f93d8591c3d4c65426029 100644
--- a/src/app/components/participant/content-choice-participant/content-choice-participant.component.html
+++ b/src/app/components/participant/content-choice-participant/content-choice-participant.component.html
@@ -22,8 +22,5 @@
   <div fxLayout fxLayoutGap="5px" fxAlign="row">
     <button mat-raised-button type="submit" color="accent">{{ 'answer.submit' | translate }}</button>
     <button mat-raised-button (click)="abstain($event)" color="primary">{{ 'answer.abstain' | translate }}</button>
-    <mat-chip-list *ngIf="isAnswerSent">
-      <mat-chip color="primary" selected="true">{{ 'answer.sent' | translate }}</mat-chip>
-    </mat-chip-list>
   </div>
 </form>
diff --git a/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts b/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
index 925ef9126be3e14f3a4282dedc16e17de0d122b2..37d778031f5f00bafeaa50584a55bd5f079b2780 100644
--- a/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
+++ b/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
@@ -30,7 +30,6 @@ export class ContentChoiceParticipantComponent implements OnInit {
   selectedSingleAnswer: string;
 
   checkedAnswers: CheckedAnswer[] = [];
-  isAnswerSent = false;
 
   constructor(private answerService: ContentAnswerService,
               private notificationService: NotificationService,
@@ -73,10 +72,8 @@ export class ContentChoiceParticipantComponent implements OnInit {
 
     if (selectedAnswers.length === 0) {
       this.notificationService.show('At least 1 selection needed');
-      this.isAnswerSent = false;
       return;
     }
-    this.isAnswerSent = true;
     this.answerService.addAnswerChoice({
       id: null,
       revision: null,
@@ -86,7 +83,6 @@ export class ContentChoiceParticipantComponent implements OnInit {
       creationTimestamp: null,
       format: ContentType.CHOICE
     } as AnswerChoice).subscribe();
-    // TODO: replace matchip with notification
   }
 
   abstain($event) {
diff --git a/src/app/components/participant/content-text-participant/content-text-participant.component.html b/src/app/components/participant/content-text-participant/content-text-participant.component.html
index 125b7e1781841b7a8563d574c8a22d0aa132649f..6818fc065bb92bbe1118abb8d743f7755aed6923 100644
--- a/src/app/components/participant/content-text-participant/content-text-participant.component.html
+++ b/src/app/components/participant/content-text-participant/content-text-participant.component.html
@@ -8,8 +8,5 @@
   <div fxLayout fxLayoutGap="5px" fxAlign="row">
     <button mat-raised-button type="submit" color="accent">{{ 'answer.submit' | translate }}</button>
     <button mat-raised-button (click)="abstain($event)" color="primary">{{ 'answer.abstain' | translate }}</button>
-    <mat-chip-list *ngIf="isAnswerSent">
-      <mat-chip color="primary" selected="true">{{ 'answer.sent' | translate }}</mat-chip>
-    </mat-chip-list>
   </div>
 </form>
diff --git a/src/app/components/participant/content-text-participant/content-text-participant.component.ts b/src/app/components/participant/content-text-participant/content-text-participant.component.ts
index 4751bb900d223bd4d4ed34d86803de210a6dcba6..ca9464c562971348a8be413c18dc65224423776d 100644
--- a/src/app/components/participant/content-text-participant/content-text-participant.component.ts
+++ b/src/app/components/participant/content-text-participant/content-text-participant.component.ts
@@ -16,7 +16,6 @@ export class ContentTextParticipantComponent implements OnInit {
   @Input() content: ContentText;
 
   textAnswer = '';
-  isAnswerSent = false;
 
   constructor(private answerService: ContentAnswerService,
               private notificationService: NotificationService,
@@ -35,7 +34,6 @@ export class ContentTextParticipantComponent implements OnInit {
       this.textAnswer = '';
       return;
     }
-    this.isAnswerSent = true;
     this.answerService.addAnswerText({
       id: null,
       revision: null,
@@ -47,7 +45,6 @@ export class ContentTextParticipantComponent implements OnInit {
       creationTimestamp: null,
       format: ContentType.TEXT
     } as AnswerText).subscribe();
-    // TODO: Set isAnswerSent
   }
 
   abstain($event) {