diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 75723dcb87f690f64bd142848c81931af5456422..935914fbac71515d1a92d6fc048b5ea6b79c9c3f 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -272,7 +272,7 @@
                [parseVote]="getVote(current)"
                [userRole]="userRole"
                [moderator]="false"
-               [isFromModerator]="moderatorIds.includes(current.creatorId)"
+               [isFromModerator]="filter.moderatorAccountIds.has(current.creatorId)"
                [isFromOwner]="room.ownerId === current.creatorId"
                [user]="user"
                [disabled]="!commentsEnabled"
diff --git a/src/app/components/shared/comment-list/comment-list.filter.ts b/src/app/components/shared/comment-list/comment-list.filter.ts
index 016fe74c8a43ccab2dddf222c955b3d0930ed64b..bc544b0aebc3f0b6018c58d81085a7ef090b6388 100644
--- a/src/app/components/shared/comment-list/comment-list.filter.ts
+++ b/src/app/components/shared/comment-list/comment-list.filter.ts
@@ -113,6 +113,10 @@ export class CommentListFilter {
     return !!this.threshold;
   }
 
+  get moderatorAccountIds() {
+    return this.moderatorIds;
+  }
+
   filterCommentsBySearch(comments: Comment[]): Comment[] {
     const search = this.currentSearch.toLowerCase();
     return comments