diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index df4dbc1407..b51fde55ca 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -1501,8 +1501,8 @@ public class GBDaoGenerator {
 
     private static Entity addWena3EnergySample(Schema schema, Entity user, Entity device) {
         Entity activitySample = addEntity(schema, "Wena3EnergySample");
-        addCommonTimeSampleProperties("AbstractTimeSample", activitySample, user, device);
-        activitySample.addIntProperty("energy").notNull();
+        addCommonTimeSampleProperties("AbstractBodyEnergySample", activitySample, user, device);
+        activitySample.addIntProperty("energy").notNull().codeBeforeGetter(OVERRIDE);
         return activitySample;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
index f82bdac25e..d9656a2da2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
@@ -44,6 +44,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Wena3Vo2SampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.AbstractNotificationPattern;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.model.BodyEnergySample;
 import nodomain.freeyourgadget.gadgetbridge.model.HeartRateSample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
@@ -141,6 +142,11 @@ public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
+    @Override
+    public boolean supportsBodyEnergy(@NonNull GBDevice device) {
+        return true;
+    }
+
     @Override
     public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
         return new SonyWena3ActivitySampleProvider(device, session);
@@ -151,6 +157,11 @@ public class SonyWena3Coordinator extends AbstractBLEDeviceCoordinator {
         return new SonyWena3HeartRateSampleProvider(device, session);
     }
 
+    @Override
+    public TimeSampleProvider<? extends BodyEnergySample> getBodyEnergySampleProvider(GBDevice device, DaoSession session) {
+        return new SonyWena3EnergySampleProvider(device, session);
+    }
+
     @Override
     public int getAlarmSlotCount(GBDevice device) {
         return SonyWena3Constants.ALARM_SLOTS;