diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html
index f863e1243..a9711f678 100644
--- a/src/addon/calendar/pages/event/event.html
+++ b/src/addon/calendar/pages/event/event.html
@@ -16,11 +16,11 @@
                 </ion-card-title>
                 <ion-item text-wrap>
                     <h2>{{ 'addon.calendar.eventstarttime' | translate}}</h2>
-                    <p>{{ event.timestart | coreToLocaleString }}</p>
+                    <p>{{ event.timestart * 1000 | coreFormatDate }}</p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="event.timeduration > 0">
                     <h2>{{ 'addon.calendar.eventendtime' | translate}}</h2>
-                    <p>{{ (event.timestart + event.timeduration) |  coreToLocaleString }}</p>
+                    <p>{{ (event.timestart + event.timeduration) * 1000 | coreFormatDate }}</p>
                 </ion-item>
                 <a ion-item text-wrap *ngIf="courseName" [href]="courseUrl" core-link capture="true">
                     <h2>{{ 'core.course' | translate}}</h2>
diff --git a/src/addon/calendar/pages/list/list.html b/src/addon/calendar/pages/list/list.html
index 393ae76be..e5cdc3eb0 100644
--- a/src/addon/calendar/pages/list/list.html
+++ b/src/addon/calendar/pages/list/list.html
@@ -32,7 +32,7 @@
                         <p>
                             {{ event.timestart * 1000 | coreFormatDate: "strftimetime" }}
                             <span *ngIf="event.timeduration && event.endsSameDay"> - {{ (event.timestart + event.timeduration) * 1000 | coreFormatDate: "strftimetime" }}</span>
-                            <span *ngIf="event.timeduration && !event.endsSameDay"> - {{ (event.timestart + event.timeduration) | coreToLocaleString }}</span>
+                            <span *ngIf="event.timeduration && !event.endsSameDay"> - {{ (event.timestart + event.timeduration) * 1000 | coreFormatDate: "strftimedatetimeshort" }}</span>
                         </p>
                     </a>
                 </ng-container>
diff --git a/src/pipes/to-locale-string.ts b/src/pipes/to-locale-string.ts
index 19c3434fb..6a881c468 100644
--- a/src/pipes/to-locale-string.ts
+++ b/src/pipes/to-locale-string.ts
@@ -17,6 +17,7 @@ import { CoreLoggerProvider } from '@providers/logger';
 
 /**
  * Filter to format a timestamp to a locale string. Timestamp can be in seconds or milliseconds.
+ * @deprecated since 3.6. Use coreFormatDate instead.
  */
 @Pipe({
     name: 'coreToLocaleString',