diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java
index 06e4c1b89..0ffe9c2ef 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java
@@ -55,9 +55,7 @@ public Output getValue(Instant now) {
     /**
      * Reset long term aggregated values (more than derived from previous SensorData). e.g. overall distance.
      */
-    public void reset() {
-        value = getNoneValue();
-    }
+    public void reset() {}
 
     /**
      * Is the data recent considering the current time.
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java
index 4717c107c..06f9fbb7e 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java
@@ -37,5 +37,10 @@ protected AltitudeGainLoss getNoneValue() {
         return new AltitudeGainLoss(0f, 0f);
     }
 
+    @Override
+    public void reset() {
+        value = getNoneValue();
+    }
+
     public record Data(Altitude gain, Altitude loss) {}
 }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
index feb9ff7f9..5e8acaa6d 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
@@ -16,6 +16,11 @@ protected void computeValue(Raw<Position> current) {
         value = current.value();
     }
 
+    @Override
+    public void reset() {
+        value = null;
+    }
+
     @NonNull
     @Override
     protected Position getNoneValue() {
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
index 90d5a9f1f..9bc470c87 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
@@ -15,11 +15,6 @@ protected void computeValue(Raw<HeartRate> current) {
         this.value = current.value();
     }
 
-    @Override
-    public void reset() {
-        // We don't need to reset the heart rate as this value is valid for a certain amount of time: and it is not an aggregate.
-    }
-
     @NonNull
     @Override
     protected HeartRate getNoneValue() {