diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
index 313ac34d1..3e49dd7a6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
@@ -22,8 +22,8 @@ public class DataActivity extends AbstractGBActivity {
 
     private enum ValueDisplay{
         VOLTAGE("voltage", "%.3fV", R.id.um25_text_voltage, 1000),
-        CURRENT("current", "%.4fA", R.id.um25_text_current, 1000),
-        WATTAGE("wattage", "%.4fW", R.id.um25_text_wattage, 1000),
+        CURRENT("current", "%.4fA", R.id.um25_text_current, 10000),
+        WATTAGE("wattage", "%.3fW", R.id.um25_text_wattage, 1000),
         ;
 
         private String variableName;
@@ -60,6 +60,9 @@ public class DataActivity extends AbstractGBActivity {
         super.onPause();
         LocalBroadcastManager.getInstance(this)
                 .unregisterReceiver(measurementReceiver);
+        for(TextView view : valueViews.values()){
+            view.setText("-");
+        }
     }
 
     private void displayMeasurementData(MeasurementData data){
diff --git a/app/src/main/res/layout/activity_um25_data.xml b/app/src/main/res/layout/activity_um25_data.xml
index b39781991..686445714 100644
--- a/app/src/main/res/layout/activity_um25_data.xml
+++ b/app/src/main/res/layout/activity_um25_data.xml
@@ -11,7 +11,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="-"
             android:id="@+id/um25_text_voltage"
             android:gravity="center_horizontal"
             android:textSize="@dimen/um25_value_text_size"
@@ -20,7 +19,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="-"
             android:id="@+id/um25_text_current"
             android:gravity="center_horizontal"
             android:textSize="@dimen/um25_value_text_size"
@@ -29,7 +27,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="-"
             android:id="@+id/um25_text_wattage"
             android:gravity="center_horizontal"
             android:textSize="@dimen/um25_value_text_size"