diff --git a/src/WebApi_ws_vedirect_live.cpp b/src/WebApi_ws_vedirect_live.cpp
index 1decc2e41..b72ec653a 100644
--- a/src/WebApi_ws_vedirect_live.cpp
+++ b/src/WebApi_ws_vedirect_live.cpp
@@ -205,9 +205,9 @@ void WebApiWsVedirectLiveClass::populateJson(const JsonObject &root, const VeDir
         output["BatteryType"]   = mpptData.getBatteryTypeAsString();
     if (mpptData.BatteryAbsorptionMilliVolt.first > 0)
         addOutputValue(output, "BatteryAbsorptionVoltage", mpptData.BatteryAbsorptionMilliVolt.second / 1000.0, "V", 2);
-    if (mpptData.BatteryAbsorptionMilliVolt.first > 0)
-        addOutputValue(output, "BatteryFloatVoltage", mpptData.BatteryFloatMilliVolt.second / 1000.0, "V", 2);
     if (mpptData.BatteryFloatMilliVolt.first > 0)
+        addOutputValue(output, "BatteryFloatVoltage", mpptData.BatteryFloatMilliVolt.second / 1000.0, "V", 2);
+    if (mpptData.BatteryMaximumCurrent.first > 0)
         addOutputValue(output, "BatteryMaxCurrent", mpptData.BatteryMaximumCurrent.second / 1000.0, "A", 1);
     if (mpptData.SmartBatterySenseTemperatureMilliCelsius.first > 0)
         addOutputValue(output, "BatteryTemperature", mpptData.SmartBatterySenseTemperatureMilliCelsius.second / 1000.0, "°C", 1);