diff --git a/src/v1_TeslaMateAPICarsCharges.go b/src/v1_TeslaMateAPICarsCharges.go
index d60ddbf..cc9995e 100644
--- a/src/v1_TeslaMateAPICarsCharges.go
+++ b/src/v1_TeslaMateAPICarsCharges.go
@@ -106,7 +106,7 @@ func TeslaMateAPICarsChargesV1(c *gin.Context) {
 			end_date,
 			COALESCE(geofence.name, CONCAT_WS(', ', COALESCE(address.name, nullif(CONCAT_WS(' ', address.road, address.house_number), '')), address.city)) AS address,
 			COALESCE(charge_energy_added, 0) AS charge_energy_added,
-			COALESCE(charge_energy_used, 0) AS charge_energy_used,
+			COALESCE(GREATEST(charge_energy_used, charge_energy_added), 0) AS charge_energy_used,
 			COALESCE(cost, 0) AS cost,
 			start_ideal_range_km AS start_ideal_range,
 			end_ideal_range_km AS end_ideal_range,
diff --git a/src/v1_TeslaMateAPICarsChargesDetails.go b/src/v1_TeslaMateAPICarsChargesDetails.go
index 7720677..1c4d847 100644
--- a/src/v1_TeslaMateAPICarsChargesDetails.go
+++ b/src/v1_TeslaMateAPICarsChargesDetails.go
@@ -125,7 +125,7 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) {
 			end_date,
 			COALESCE(geofence.name, CONCAT_WS(', ', COALESCE(address.name, nullif(CONCAT_WS(' ', address.road, address.house_number), '')), address.city)) AS address,
 			COALESCE(charging_processes.charge_energy_added, 0) AS charge_energy_added,
-			COALESCE(charge_energy_used, 0) AS charge_energy_used,
+			COALESCE(GREATEST(charge_energy_used, charging_processes.charge_energy_added), 0) AS charge_energy_used,
 			COALESCE(cost, 0) AS cost,
 			start_ideal_range_km AS start_ideal_range,
 			end_ideal_range_km AS end_ideal_range,