diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java
index 08a956d9e..4ac2461d1 100644
--- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java
+++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java
@@ -17,6 +17,13 @@ public final class SensorDataSet {
     public SensorDataSet() {
     }
 
+    public SensorDataSet(SensorDataSet toCopy) {
+        this.heartRate = toCopy.heartRate;
+        this.cyclingCadence = toCopy.cyclingCadence;
+        this.cyclingDistanceSpeed = toCopy.cyclingDistanceSpeed;
+        this.cyclingPower = toCopy.cyclingPower;
+    }
+
     public SensorDataHeartRate getHeartRate() {
         return heartRate;
     }
diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java
index e82365312..e306549b9 100644
--- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java
@@ -166,8 +166,7 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
     }
 
     public SensorDataSet getSensorDataSet() {
-        // TODO Should return a copy.
-        return sensorDataSet;
+        return new SensorDataSet(sensorDataSet);
     }
 
     public void reset() {