diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
index bec01283..9a143e8b 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
@@ -149,11 +149,10 @@ public class DataEntryActivity extends Activity {
 
         if (scaleMeasurement == null || scaleMeasurement.getId() != id) {
             isDirty = false;
+            scaleMeasurement = null;
+            previousMeasurement = null;
         }
 
-        scaleMeasurement = null;
-        previousMeasurement = null;
-
         OpenScale openScale = OpenScale.getInstance(context);
         boolean doExpand = false;
 
@@ -175,9 +174,11 @@ public class DataEntryActivity extends Activity {
             }
 
             // Show selected scale data
-            ScaleMeasurement[] tupleScaleData = openScale.getTupleScaleData(id);
-            previousMeasurement = tupleScaleData[0];
-            scaleMeasurement = tupleScaleData[1].clone();
+            if (scaleMeasurement ==  null) {
+                ScaleMeasurement[] tupleScaleData = openScale.getTupleScaleData(id);
+                previousMeasurement = tupleScaleData[0];
+                scaleMeasurement = tupleScaleData[1].clone();
+            }
         } else {
             setViewMode(MeasurementView.MeasurementViewMode.ADD);