diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
index 6021848a7..ed58df238 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
@@ -250,13 +250,16 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     }
 
     public SensorDataSet getSensorDataSet(Instant now) {
+        //We always need a Position with now
         SensorData<Position> gpsSensorData = gpsHandler.getSensorData(now);
-
-        var a = temperatureHandler.getSensorData(now);
-        var b = altitudeChangeHandler.getSensorData(now);
+        if (gpsSensorData != null && gpsSensorData.data() != null) {
+            gpsSensorData = new SensorData<>(gpsSensorData.data().with(now), gpsSensorData.sensorNameOrAddress());
+        } else {
+            gpsSensorData = new SensorData<>(Position.of(now), "");
+        }
 
         return new SensorDataSet(
-                gpsSensorData != null ? gpsSensorData : new SensorData<>(Position.of(now), ""), //We always need a Position(now)
+                gpsSensorData,
                 getSpeed(now),
                 getDistance(now),
                 getHeartRate(now),
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 f57f3bbfb..5fbbc8529 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
@@ -2,10 +2,6 @@ package de.dennisguse.opentracks.sensors.sensorData;
 
 import android.location.Location;
 
-import androidx.annotation.NonNull;
-
-import java.time.Instant;
-
 import de.dennisguse.opentracks.data.models.Position;
 
 public class AggregatorGPS extends Aggregator<Location, Position> {
@@ -28,13 +24,4 @@ public class AggregatorGPS extends Aggregator<Location, Position> {
          */
         output = null;
     }
-
-    @NonNull
-    @Override
-    public Position getAggregatedValue(Instant now) {
-        Position value = super.getAggregatedValue(now);
-        if (value == null) value = Position.empty();
-
-        return value.with(now);
-    }
 }