diff --git a/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
index 0c960485..d377d636 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
@@ -392,8 +392,12 @@ public class ChartMeasurementView extends LineChart {
             addTrendLine(lineDataSets);
         }
 
-        LineData data = new LineData(lineDataSets);
-        setData(data);
+        if (!lineDataSets.isEmpty()) {
+            LineData data = new LineData(lineDataSets);
+            setData(data);
+        } else {
+            setData(null);
+        }
 
         if (prefs.getBoolean("goalLine", false)) {
             addGoalLine(lineDataSets);
@@ -424,7 +428,7 @@ public class ChartMeasurementView extends LineChart {
             measurementLine.enableDashedLine(0, 1, 0);
         }
 
-        if (measurementView.isVisible()) {
+        if (measurementView.isVisible() && !lineEntries.isEmpty()) {
             if (isInGraphKey) {
                 if (measurementView.getSettings().isInGraph()) {
                     lineDataSets.add(measurementLine);