diff --git a/src/app/frontend/common/components/date/template.html b/src/app/frontend/common/components/date/template.html
index d482ae7cbeaa..a933d181ac30 100644
--- a/src/app/frontend/common/components/date/template.html
+++ b/src/app/frontend/common/components/date/template.html
@@ -14,11 +14,7 @@
 limitations under the License.
 -->
 
-<span *ngIf="_relative"
-      class="kd-date"
+<span class="kd-date"
       [matTooltip]="date | date:format">
-  {{date | kdRelativeTime}}
-</span>
-<span *ngIf="!_relative">
-  {{date | date:format}}
+  {{_relative ? (date | kdRelativeTime) : (date | date)}}
 </span>
diff --git a/src/app/frontend/common/components/resourcelist/event/template.html b/src/app/frontend/common/components/resourcelist/event/template.html
index d61b328715e4..cf1a00f17e3b 100644
--- a/src/app/frontend/common/components/resourcelist/event/template.html
+++ b/src/app/frontend/common/components/resourcelist/event/template.html
@@ -70,7 +70,7 @@
         <mat-header-cell *matHeaderCellDef
                          i18n>First Seen</mat-header-cell>
         <mat-cell *matCellDef="let event">
-          {{event.firstSeen | date}}
+          <kd-date [date]="event.firstSeen"></kd-date>
         </mat-cell>
       </ng-container>
 
@@ -78,7 +78,7 @@
         <mat-header-cell *matHeaderCellDef
                          i18n>Last Seen</mat-header-cell>
         <mat-cell *matCellDef="let event">
-          {{event.lastSeen | date}}
+          <kd-date [date]="event.lastSeen"></kd-date>
         </mat-cell>
       </ng-container>