diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
index 601bb17ae8091a44e1b94a5a2e4389e6c55daf62..cea02be19c9ebaaf5cf4728ca08b3da906125ddf 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -14,8 +14,8 @@
 
     <!-- filter input -->
     <mat-form-field *ngIf="this.rooms && this.rooms.length > 5" class="filterWrapper">
-      <input (focus)="eventService.makeFocusOnInputTrue()" (blur)="eventService.makeFocusOnInputFalse()" matInput (keyup)="applyFilter($event.target.value)"
-             class="filter"
+      <input (focus)="eventService.makeFocusOnInputTrue()" (blur)="eventService.makeFocusOnInputFalse()" matInput
+             (keyup)="applyFilter($event.target.value)" class="filter"
              attr.aria-labelledby="sessionHistoryLabel{{ this.rooms.length === 1 ? '1' : '' }}"/>
       <mat-placeholder class="placeholder">{{ 'room-list.filter-message' | translate }}</mat-placeholder>
     </mat-form-field>
@@ -29,7 +29,9 @@
             {{ 'room-list.panel-session-name' | translate }}
           </th>
           <td mat-cell *matCellDef="let room">
-            <span matBadge="{{room.commentCount}}" matBadgeOverlap="false">{{ room.name }}</span>
+            <span matBadge="{{room.commentCount > 0 ? room.commentCount : null}}" matBadgeOverlap="false">
+              {{ room.name }}
+            </span>
           </td>
         </ng-container>