diff --git a/dist/power-flux-card.js b/dist/power-flux-card.js
index d65ef37..2400503 100644
--- a/dist/power-flux-card.js
+++ b/dist/power-flux-card.js
@@ -1820,13 +1820,7 @@ console.log(
         const val = parseFloat(state.state);
         if (isNaN(val)) return state.state + (state.attributes.unit_of_measurement ? ' ' + state.attributes.unit_of_measurement : '');
         const unit = state.attributes.unit_of_measurement || '';
-        if (unit === 'W' || unit === 'Wh') {
-          return this._formatPower(val);
-        }
-        if (unit === 'kWh' || unit === 'kW') {
-          return val.toFixed(1) + ' ' + unit;
-        }
-        return val.toFixed(1) + (unit ? ' ' + unit : '');
+        if (unit === 'W') {          return this._formatPower(val);        }        if (unit === 'Wh') {          if (Math.abs(val) >= 1000) return (val / 1000).toFixed(2) + ' kWh';          return Math.round(val) + ' Wh';        }        if (unit === 'kWh' || unit === 'kW') {          return val.toFixed(1) + ' ' + unit;        }        if (unit.includes('EUR') || unit.includes('ct') || unit.includes('€')) {          return val.toFixed(2) + ' ' + unit;        }        return val.toFixed(1) + (unit ? ' ' + unit : '');
       };
 
       // Determine existence of main entities
diff --git a/src/power-flux-card.js b/src/power-flux-card.js
index 4db2e67..842366d 100644
--- a/src/power-flux-card.js
+++ b/src/power-flux-card.js
@@ -820,13 +820,7 @@ console.log(
         const val = parseFloat(state.state);
         if (isNaN(val)) return state.state + (state.attributes.unit_of_measurement ? ' ' + state.attributes.unit_of_measurement : '');
         const unit = state.attributes.unit_of_measurement || '';
-        if (unit === 'W' || unit === 'Wh') {
-          return this._formatPower(val);
-        }
-        if (unit === 'kWh' || unit === 'kW') {
-          return val.toFixed(1) + ' ' + unit;
-        }
-        return val.toFixed(1) + (unit ? ' ' + unit : '');
+        if (unit === 'W') {          return this._formatPower(val);        }        if (unit === 'Wh') {          if (Math.abs(val) >= 1000) return (val / 1000).toFixed(2) + ' kWh';          return Math.round(val) + ' Wh';        }        if (unit === 'kWh' || unit === 'kW') {          return val.toFixed(1) + ' ' + unit;        }        if (unit.includes('EUR') || unit.includes('ct') || unit.includes('€')) {          return val.toFixed(2) + ' ' + unit;        }        return val.toFixed(1) + (unit ? ' ' + unit : '');
       };
 
       // Determine existence of main entities