diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html
index 1fb162539e..f4a2b6f987 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html
@@ -173,7 +173,7 @@
           <button mat-icon-button
                   type="button"
                   matSuffix
-                  *ngIf="getAlarmCommentFormControl().value"
+                  *ngIf="getAlarmCommentValue()"
                   (click)="saveComment()">
             <mat-icon color="primary">
               send
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts
index 88277588dc..cd1c9f6a05 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts
@@ -156,7 +156,7 @@ export class AlarmCommentComponent implements OnInit {
   }
 
   saveComment(): void {
-    const commentInputValue: string = this.getAlarmCommentFormControl().value;
+    const commentInputValue: string = this.getAlarmCommentValue();
     if (commentInputValue) {
       const comment: AlarmComment = {
         alarmId: {
@@ -174,7 +174,7 @@ export class AlarmCommentComponent implements OnInit {
   }
 
   saveEditedComment(commentId: string): void {
-    const commentEditInputValue: string = this.getAlarmCommentEditFormControl().value;
+    const commentEditInputValue: string = this.getAlarmCommentEditValue();
     if (commentEditInputValue) {
       const editedComment: AlarmComment = this.getAlarmCommentById(commentId);
       editedComment.comment.text = commentEditInputValue;
@@ -277,6 +277,14 @@ export class AlarmCommentComponent implements OnInit {
     return this.alarmCommentFormGroup.get('alarmCommentEdit');
   }
 
+  getAlarmCommentValue(): string {
+    return this.alarmCommentFormGroup.get('alarmComment').value.trim();
+  }
+
+  private getAlarmCommentEditValue(): string {
+    return this.alarmCommentFormGroup.get('alarmCommentEdit').value.trim();
+  }
+
   private clearCommentInput(): void {
     this.getAlarmCommentFormControl().patchValue('');
   }