diff --git a/components/dashboard/Chart.tsx b/components/dashboard/Chart.tsx
index 2b91c7e..0e5c4f2 100644
--- a/components/dashboard/Chart.tsx
+++ b/components/dashboard/Chart.tsx
@@ -439,8 +439,8 @@ export default function Chart({
                 <VisxXAxis
                   numTicks={6}
                   formatLabel={interval === 'minute' || interval === 'hour'
-                    ? (d) => d.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' })
-                    : undefined
+                    ? (d) => d.toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' })
+                    : (d) => d.toLocaleDateString('en-GB', { day: 'numeric', month: 'short' })
                   }
                 />
                 <VisxYAxis
@@ -452,12 +452,12 @@ export default function Chart({
                 />
                 <VisxChartTooltip
                   content={({ point }) => {
-                    const dateObj = point.dateObj as Date
+                    const dateObj = point.dateObj instanceof Date ? point.dateObj : new Date(point.dateObj as string || Date.now())
                     const config = METRIC_CONFIGS.find((m) => m.key === metric)
                     const value = point[metric] as number
                     const title = interval === 'minute' || interval === 'hour'
-                      ? dateObj.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' })
-                      : dateObj.toLocaleDateString('en-US', { weekday: 'short', month: 'short', day: 'numeric' })
+                      ? dateObj.toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' })
+                      : dateObj.toLocaleDateString('en-GB', { weekday: 'short', day: 'numeric', month: 'short' })
                     return (
                       <div className="px-3 py-2.5">
                         <div className="mb-2 font-medium text-neutral-400 text-xs">{title}</div>
diff --git a/components/ui/area-chart.tsx b/components/ui/area-chart.tsx
index e2d52fd..7fe4fd2 100644
--- a/components/ui/area-chart.tsx
+++ b/components/ui/area-chart.tsx
@@ -1061,7 +1061,7 @@ export function ChartTooltip({
     if (barXAccessor) {
       return barXAccessor(tooltipData.point);
     }
-    return xAccessor(tooltipData.point).toLocaleDateString("en-US", {
+    return xAccessor(tooltipData.point).toLocaleDateString("en-GB", {
       weekday: "short",
       month: "short",
       day: "numeric",
@@ -1377,7 +1377,7 @@ export function XAxis({ numTicks = 5, tickerHalfWidth = 50, formatLabel }: XAxis
       dates.push(new Date(time));
     }
 
-    const defaultFormat = (d: Date) => d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+    const defaultFormat = (d: Date) => d.toLocaleDateString("en-GB", { month: "short", day: "numeric" });
     const fmt = formatLabel ?? defaultFormat;
 
     return dates.map((date) => ({
@@ -2135,7 +2135,7 @@ function ChartInner({
   const dateLabels = useMemo(
     () =>
       data.map((d) =>
-        xAccessor(d).toLocaleDateString("en-US", {
+        xAccessor(d).toLocaleDateString("en-GB", {
           month: "short",
           day: "numeric",
         })