diff --git a/client/src/app/running/running-metric-chart.component.ts b/client/src/app/running/running-metric-chart.component.ts
index 26d0144..d55d407 100644
--- a/client/src/app/running/running-metric-chart.component.ts
+++ b/client/src/app/running/running-metric-chart.component.ts
@@ -113,6 +113,9 @@ export class RunningMetricChartComponent
   }
 
   private chartOptions(): ChartOptions<'line'> {
+    const points = this.points();
+    const maxX = points.length > 0 ? Math.max(...points.map((p) => p.x)) : undefined;
+
     return {
       animation: { duration: 250 },
       interaction: { intersect: false, mode: 'index' },
@@ -149,6 +152,8 @@ export class RunningMetricChartComponent
             text: 'Distanz',
           },
           type: 'linear',
+          max: maxX,
+          bounds: 'data',
         },
         y: {
           grid: { color: 'rgba(104, 115, 134, 0.14)' },