diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js
index da44df86f..94fd67a13 100644
--- a/files/assets/js/chat.js
+++ b/files/assets/js/chat.js
@@ -1,8 +1,5 @@
 function formatDate(d) {
-	const hour = ("0" + d.getHours()).slice(-2);
-	const minute = ("0" + d.getMinutes()).slice(-2);
-	const second = ("0" + d.getSeconds()).slice(-2);
-	return hour + ":" + minute + ":" + second;
+	return d.toLocaleTimeString()
 }
 
 for (const e of timestamps) {
diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index 608f9065c..8c7844383 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -231,14 +231,8 @@ function showmore(t) {
 }
 
 function formatDate(d) {
-	const year = d.getFullYear();
-	const monthAbbr = d.toLocaleDateString('en-us', {month: 'short'});
-	const day = d.getDate();
-	const hour = ("0" + d.getHours()).slice(-2);
-	const minute = ("0" + d.getMinutes()).slice(-2);
-	const second = ("0" + d.getSeconds()).slice(-2);
-	const tzAbbr = d.toLocaleTimeString('en-us', {timeZoneName: 'short'}).split(' ')[2];
-	return day + " " + monthAbbr + " " + year + " " + hour + ":" + minute + ":" + second + " " + tzAbbr;
+	const options = {year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', timeZoneName: 'short'};
+	return d.toLocaleTimeString([], options)
 }
 
 const timestamps = document.querySelectorAll('[data-time]');