diff --git a/assets/js/components/Config/DeviceTags.vue b/assets/js/components/Config/DeviceTags.vue
index 3c6b65c84..383a178b4 100644
--- a/assets/js/components/Config/DeviceTags.vue
+++ b/assets/js/components/Config/DeviceTags.vue
@@ -211,12 +211,12 @@ export default {
 				case "dimLimit":
 				case "curtailLimit":
 				case "exportLimit":
-					return this.fmtW(value);
+					return this.fmtW(value, POWER_UNIT.AUTO);
 				case "energy":
 				case "returnEnergy":
 				case "capacity":
 				case "chargedEnergy":
-					return this.fmtWh(value * 1e3);
+					return this.fmtWh(value * 1e3, POWER_UNIT.AUTO);
 				case "soc":
 				case "vehicleLimitSoc":
 					return this.fmtPercentage(value, 1);
diff --git a/tests/config-aux.spec.ts b/tests/config-aux.spec.ts
index 1b17df817..f1b34d2ab 100644
--- a/tests/config-aux.spec.ts
+++ b/tests/config-aux.spec.ts
@@ -125,7 +125,7 @@ energy:
     await expect(restResult).toContainText("Status: unknown");
     await restResult.getByRole("link", { name: "validate" }).click();
     await expect(restResult).toContainText("Status: successful");
-    await expect(restResult).toContainText(["Power", "0.3 kW"].join(""));
+    await expect(restResult).toContainText(["Power", "300 W"].join(""));
     await expect(restResult).toContainText(["Energy", "4.2 kWh"].join(""));
     await modal.getByRole("button", { name: "Save" }).click();
     await expectModalHidden(modal);
diff --git a/tests/config-loadpoint.spec.ts b/tests/config-loadpoint.spec.ts
index f031cf0c7..a2495cd6c 100644
--- a/tests/config-loadpoint.spec.ts
+++ b/tests/config-loadpoint.spec.ts
@@ -730,7 +730,7 @@ temp:
     await restResult.getByRole("link", { name: "validate" }).click();
     await expect(restResult).toContainText("Status: successful");
     await expect(restResult).toContainText(["Power", "1.0 kW"].join(""));
-    await expect(restResult).toContainText(["Energy", "0.7 kWh"].join(""));
+    await expect(restResult).toContainText(["Energy", "700 Wh"].join(""));
     await expect(restResult).toContainText(["Temperature", "25.0°C"].join(""));
     await expect(restResult).toContainText(["Heater limit", "50.0°C"].join(""));