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 25db54641d..0e5b9977ca 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
@@ -69,7 +69,7 @@
         <ng-template #userComment>
           <div class="user-comment flex flex-row items-center justify-start gap-2"
                *ngIf="!displayDataElement.edit; else commentEditing"
-               (mouseenter)="onCommentMouseEnter(displayDataElement.commentId, i)"
+               (mouseenter)="onCommentMouseEnter(i)"
                (mouseleave)="onCommentMouseLeave(i)">
             <div *ngIf="displayDataElement.userExists; else userDeleted"
                  class="user-avatar flex flex-row items-center justify-center self-start xs:!hidden"
@@ -98,11 +98,13 @@
             <div class="action-buttons flex flex-row xs:flex-col"
                  [class.show-buttons]="displayDataElement.showActions">
               <button mat-icon-button
+                      *ngIf="displayDataElement.canEdit"
                       type="button"
                       (click)="editComment(displayDataElement.commentId)">
                 <mat-icon class="material-icons">edit</mat-icon>
               </button>
               <button mat-icon-button
+                      *ngIf="displayDataElement.canDelete"
                       type="button"
                       (click)="deleteComment(displayDataElement.commentId)">
                 <mat-icon class="material-icons">delete</mat-icon>
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 1121b53d3d..8cd581b86a 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
@@ -22,6 +22,7 @@ import { AlarmCommentService } from '@core/http/alarm-comment.service';
 import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms';
 import { DialogService } from '@core/services/dialog.service';
 import { AuthUser } from '@shared/models/user.model';
+import { Authority } from '@shared/models/authority.enum';
 import { getCurrentAuthUser, selectUserDetails } from '@core/auth/auth.selectors';
 import { Direction, SortOrder } from '@shared/models/page/sort-order';
 import { MAX_SAFE_PAGE_SIZE, PageLink } from '@shared/models/page/page-link';
@@ -44,6 +45,8 @@ interface AlarmCommentsDisplayData {
   editedTime?: string;
   editedDateAgo?: string;
   showActions?: boolean;
+  canEdit?: boolean;
+  canDelete?: boolean;
   commentText?: string;
   isSystemComment?: boolean;
   avatarBgColor?: string;
@@ -135,6 +138,11 @@ export class AlarmCommentComponent implements OnInit {
             displayDataElement.editedTime = this.datePipe.transform(alarmComment.comment.editedOn, 'yyyy-MM-dd HH:mm:ss');
             displayDataElement.editedDateAgo = this.dateAgoPipe.transform(alarmComment.comment.editedOn) + '\n';
             displayDataElement.showActions = false;
+            const isCommentAuthor = this.authUser.userId === alarmComment.userId?.id;
+            // Mirrors backend AlarmCommentController#deleteAlarmComment / checkUserPermission:
+            // author may edit and delete own comments; tenant admin may delete any comment.
+            displayDataElement.canEdit = isCommentAuthor;
+            displayDataElement.canDelete = isCommentAuthor || this.authUser.authority === Authority.TENANT_ADMIN;
             displayDataElement.isSystemComment = false;
             displayDataElement.avatarBgColor = this.utilsService.stringToHslColor(displayDataElement.displayName,
               40, 60);
@@ -243,11 +251,11 @@ export class AlarmCommentComponent implements OnInit {
     return this.alarmCommentSortOrder.direction === Direction.ASC;
   }
 
-  onCommentMouseEnter(commentId: string, displayDataIndex: number): void {
+  onCommentMouseEnter(displayDataIndex: number): void {
     if (!this.editMode) {
-      const alarmUserId = this.getAlarmCommentById(commentId).userId.id;
-      if (this.authUser.userId === alarmUserId) {
-        this.displayData[displayDataIndex].showActions = true;
+      const displayDataElement = this.displayData[displayDataIndex];
+      if (displayDataElement.canEdit || displayDataElement.canDelete) {
+        displayDataElement.showActions = true;
       }
     }
   }