diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java
index 9ac085d7..a4d39925 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java
@@ -3,4 +3,12 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
 public class HeartRateUtils {
     public static final int MAX_HEART_RATE_VALUE = 250;
     public static final int MIN_HEART_RATE_VALUE = 0;
+    /**
+     * The maxiumum gap between two hr measurements in which
+     * we interpolate between the measurements. Otherwise, two
+     * distinct measurements will be shown.
+     *
+     * Value is in minutes
+     */
+    public static final int MAX_HR_MEASUREMENTS_GAP_MINUTES = 10;
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
index 60c6dfa0..c8cb4d7c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
@@ -421,6 +421,7 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
             boolean hr = supportsHeartrate();
             List<Entry> heartrateEntries = hr ? new ArrayList<Entry>(numEntries) : null;
             List<Integer> colors = new ArrayList<>(numEntries); // this is kinda inefficient...
+            int lastHrSampleIndex = -1;
 
             for (int i = 0; i < numEntries; i++) {
                 ActivitySample sample = samples.get(i);
@@ -463,7 +464,13 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
                 }
                 activityEntries.add(createBarEntry(value, i));
                 if (hr && isValidHeartRateValue(sample.getCustomValue())) {
+                    if (lastHrSampleIndex > -1 && i - lastHrSampleIndex > HeartRateUtils.MAX_HR_MEASUREMENTS_GAP_MINUTES) {
+                        heartrateEntries.add(createLineEntry(0, lastHrSampleIndex + 1));
+                        heartrateEntries.add(createLineEntry(0, i - 1));
+                    }
+
                     heartrateEntries.add(createLineEntry(sample.getCustomValue(), i));
+                    lastHrSampleIndex = i;
                 }
 
                 String xLabel = "";