diff --git a/assets/js/components/ChargingSessionModal.vue b/assets/js/components/ChargingSessionModal.vue
index 9b6215d73..e2e9d96c2 100644
--- a/assets/js/components/ChargingSessionModal.vue
+++ b/assets/js/components/ChargingSessionModal.vue
@@ -67,7 +67,12 @@
 										{{ $t("sessions.energy") }}
 									</th>
 									<td>
-										{{ fmtKWh(session.chargedEnergy * 1e3) }}
+										{{
+											fmtKWh(
+												session.chargedEnergy * 1e3,
+												session.chargedEnergy >= 1
+											)
+										}}
 									</td>
 								</tr>
 								<tr v-if="session.solarPercentage != null">
diff --git a/assets/js/views/ChargingSessions.vue b/assets/js/views/ChargingSessions.vue
index 227c763d6..85b5518e1 100644
--- a/assets/js/views/ChargingSessions.vue
+++ b/assets/js/views/ChargingSessions.vue
@@ -90,7 +90,12 @@
 											{{ session.vehicle }}
 										</td>
 										<td class="text-end">
-											{{ fmtKWh(session.chargedEnergy * 1e3) }}
+											{{
+												fmtKWh(
+													session.chargedEnergy * 1e3,
+													session.chargedEnergy >= 1
+												)
+											}}
 										</td>
 										<td class="text-end">
 											<span v-if="session.solarPercentage != null">