diff --git a/src/utils/index.ts b/src/utils/index.ts
index 027388f..abd87df 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -34,20 +34,23 @@ const sortSequence = (sequence: Array<Group | Route | Rule>, sortOnField = "sequ
 }
 
 const getTime = (time: any) => {
-  return time ? DateTime.fromMillis(time).toLocaleString(DateTime.TIME_SIMPLE) : "-";
+  // Directly using TIME_SIMPLE for formatting the time results the time always in 24-hour format, as the Intl is set in that way. So, using hourCycle to always get the time in 12-hour format
+  // https://github.com/moment/luxon/issues/998
+  return time ? DateTime.fromMillis(time).toLocaleString({ ...DateTime.TIME_SIMPLE, hourCycle: "h12" }) : "-";
 }
 
 function getDate(runTime: any) {
-  return DateTime.fromMillis(runTime).toLocaleString(DateTime.DATE_MED);
+  return DateTime.fromMillis(runTime).toLocaleString({ ...DateTime.DATE_MED, hourCycle: "h12" });
 }
 
 function getDateAndTime(time: any) {
-  return time ? DateTime.fromMillis(time).toLocaleString(DateTime.DATETIME_MED) : "-";
+  return time ? DateTime.fromMillis(time).toLocaleString({ ...DateTime.DATETIME_MED, hourCycle: "h12" }) : "-";
 }
 
 function getDateAndTimeShort(time: any) {
-  // format: hh:mm(localized 24-hour time) date/month
-  return time ? DateTime.fromMillis(time).toFormat("T dd/LL") : "-";
+  // format: hh:mm(localized 12-hour time) date/month
+  // Using toLocaleString as toFormat is not converting the time in 12-hour format
+  return time ? DateTime.fromMillis(time).toLocaleString({ hour: "numeric", minute: "numeric", day: "numeric", month: "numeric", hourCycle: "h12" }) : "-";
 }
 
 function timeTillRun(endTime: any) {
diff --git a/src/views/BrokeringRuns.vue b/src/views/BrokeringRuns.vue
index 5ed6d1f..6b7d62b 100644
--- a/src/views/BrokeringRuns.vue
+++ b/src/views/BrokeringRuns.vue
@@ -113,6 +113,10 @@ onIonViewWillEnter(async () => {
 })
 
 function timeTillRun(time: any) {
+  if(!time) {
+    return;
+  }
+
   const timeDiff = DateTime.fromMillis(time).diff(DateTime.local());
   return DateTime.local().plus(timeDiff).toRelative();
 }
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index f501fb9..b4a37ea 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -142,7 +142,7 @@ function logout() {
 }
 
 function getDateTime(time: any) {
-  return time ? DateTime.fromMillis(time).toLocaleString(DateTime.DATETIME_MED) : "";
+  return time ? DateTime.fromMillis(time).toLocaleString({ ...DateTime.DATETIME_MED, hourCycle: "h12" }) : "";
 }
 
 function goToOms() {