diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutValueFormatter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutValueFormatter.java
index 63cf914dd8..f27381027f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutValueFormatter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutValueFormatter.java
@@ -200,6 +200,11 @@ public class WorkoutValueFormatter {
                         unit = UNIT_MINUTES_PER_100_METERS;
                     }
                     break;
+                case ActivitySummaryEntries.UNIT_JOULE:
+                    if (value > 10000) {
+                        value = value / 1000D;
+                        unit = "unit_kilojoule";
+                    }
             }
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 58b80e204c..9b619e667b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2844,6 +2844,7 @@
     <string name="unit_millimeter">mm</string>
     <string name="unit_watt">Watt</string>
     <string name="unit_joule">Joule</string>
+    <string name="unit_kilojoule">kJ</string>
     <string name="training_load">Training Load</string>
     <string name="standing_count">Standing count</string>
     <string name="average_left_platform_center_offset">Avg Left Platform Center Offset</string>