diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
index 03fc4e938..6b2986e8b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
@@ -195,8 +195,12 @@ public class BatteryInfoActivity extends AbstractGBActivity {
         setBatteryLabels();
         for (BatteryConfig batteryConfig : coordinator.getBatteryConfig(gbDevice)) {
             if (batteryConfig.getBatteryIndex() == batteryIndex) {
-                battery_status_extra_name.setText(batteryConfig.getBatteryLabel());
-                battery_status_device_icon.setImageResource(batteryConfig.getBatteryIcon());
+                if (batteryConfig.getBatteryLabel() != GBDevice.BATTERY_LABEL_DEFAULT) {
+                    battery_status_extra_name.setText(batteryConfig.getBatteryLabel());
+                }
+                if (batteryConfig.getBatteryIcon() != GBDevice.BATTERY_ICON_DEFAULT) {
+                    battery_status_device_icon.setImageResource(batteryConfig.getBatteryIcon());
+                }
                 if (gbDevice.isInitialized()) {
                     battery_status_device_icon.setColorFilter(this.getResources().getColor(R.color.accent));
                 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 86a5c9157..bc829381e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -212,7 +212,7 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
                 final Preference prefHeader = new PreferenceCategory(requireContext());
                 prefHeader.setKey("pref_battery_header_" + batteryConfig.getBatteryIndex());
                 prefHeader.setIconSpaceReserved(false);
-                if (batteryConfig.getBatteryLabel() > 0) {
+                if (batteryConfig.getBatteryLabel() != GBDevice.BATTERY_LABEL_DEFAULT) {
                     prefHeader.setTitle(batteryConfig.getBatteryLabel());
                 } else {
                     prefHeader.setTitle(requireContext().getString(R.string.battery_i, batteryConfig.getBatteryIndex()));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
index dd03b3b4a..f89406f92 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
@@ -69,11 +69,21 @@ public class BatteryConfig {
         if (this == o) return true;
         if (!(o instanceof BatteryConfig)) return false;
         BatteryConfig that = (BatteryConfig) o;
-        return getBatteryIndex() == that.getBatteryIndex() && getBatteryIcon() == that.getBatteryIcon() && getBatteryLabel() == that.getBatteryLabel();
+        return getBatteryIndex() == that.getBatteryIndex() &&
+                getBatteryIcon() == that.getBatteryIcon() &&
+                getBatteryLabel() == that.getBatteryLabel() &&
+                getDefaultLowThreshold() == that.getDefaultLowThreshold() &&
+                getDefaultFullThreshold() == that.getDefaultFullThreshold();
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getBatteryIndex(), getBatteryIcon(), getBatteryLabel());
+        return Objects.hash(
+                getBatteryIndex(),
+                getBatteryIcon(),
+                getBatteryLabel(),
+                getDefaultLowThreshold(),
+                getDefaultFullThreshold()
+        );
     }
 }