diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
index eb9e06d85..42def7c30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
@@ -289,7 +289,7 @@ public class VO2MaxFragment extends AbstractChartFragment<VO2MaxFragment.VO2MaxD
     public Vo2MaxSample getLatestVo2MaxSample(final DBHandler db, final GBDevice device, Vo2MaxSample.Type type) {
         final DeviceCoordinator coordinator = device.getDeviceCoordinator();
         final Vo2MaxSampleProvider sampleProvider = (Vo2MaxSampleProvider) coordinator.getVo2MaxSampleProvider(device, db.getDaoSession());
-        return  sampleProvider.getLatestSample(type);
+        return  sampleProvider.getLatestSample(type, getTSEnd() * 1000L);
     }
 
     private void setupVO2MaxChart() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/Vo2MaxSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/Vo2MaxSampleProvider.java
index 87dbf6d8d..276ba6ee6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/Vo2MaxSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/Vo2MaxSampleProvider.java
@@ -6,5 +6,5 @@ import nodomain.freeyourgadget.gadgetbridge.model.Vo2MaxSample;
 
 public interface Vo2MaxSampleProvider<T extends Vo2MaxSample> extends TimeSampleProvider<T> {
     @Nullable
-    T getLatestSample(Vo2MaxSample.Type type);
+    T getLatestSample(Vo2MaxSample.Type type, long until);
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminVo2MaxSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminVo2MaxSampleProvider.java
index fe9d8fc5f..b84e03836 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminVo2MaxSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminVo2MaxSampleProvider.java
@@ -96,7 +96,7 @@ public class GarminVo2MaxSampleProvider implements Vo2MaxSampleProvider<Vo2MaxSa
 
     @Nullable
     @Override
-    public Vo2MaxSample getLatestSample(final Vo2MaxSample.Type type) {
+    public Vo2MaxSample getLatestSample(final Vo2MaxSample.Type type, final long until) {
         final BaseActivitySummaryDao summaryDao = session.getBaseActivitySummaryDao();
         final Device dbDevice = DBHelper.findDevice(device, session);
         if (dbDevice == null) {
@@ -129,6 +129,10 @@ public class GarminVo2MaxSampleProvider implements Vo2MaxSampleProvider<Vo2MaxSa
                 break;
         }
 
+        if (until != 0) {
+            qb.where(BaseActivitySummaryDao.Properties.EndTime.le(new Date(until)));
+        }
+
         qb.where(BaseActivitySummaryDao.Properties.DeviceId.eq(dbDevice.getId()))
                 .orderDesc(BaseActivitySummaryDao.Properties.StartTime)
                 .limit(1);
@@ -142,7 +146,7 @@ public class GarminVo2MaxSampleProvider implements Vo2MaxSampleProvider<Vo2MaxSa
     @Nullable
     @Override
     public Vo2MaxSample getLatestSample() {
-        return getLatestSample(Vo2MaxSample.Type.GENERAL);
+        return getLatestSample(Vo2MaxSample.Type.GENERAL, 0);
     }
 
     @Nullable