diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
index cd375c52..781548f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
@@ -89,7 +89,9 @@ public abstract class AbstractSampleProvider<T extends AbstractActivitySample> i
         if (samples.isEmpty()) {
             return null;
         }
-        return samples.get(0);
+        T sample = samples.get(0);
+        sample.setProvider(this);
+        return sample;
     }
 
     protected List<T> getGBActivitySamples(int timestamp_from, int timestamp_to, int activityType) {