diff --git a/source/_integrations/fronius.markdown b/source/_integrations/fronius.markdown
index bb780e48f3c..e2d32244083 100644
--- a/source/_integrations/fronius.markdown
+++ b/source/_integrations/fronius.markdown
@@ -80,8 +80,10 @@ Recommended energy dashboard configuration for meter location in feed in path (`
 
 - For `Grid consumption` use the meters `Energy real consumed` entity.
 - For `Return to grid` use the meters `Energy real produced` entity.
-- For `Solar production` add each inverters `Energy total` entity.
-- `Battery systems` aren't supported directly. Use [Riemann sum](/integrations/integration/) with negative values of `Power battery` entity (from power_flow endpoint found in your `SolarNet` device) for charging and positive values for discharging.
+- For `Solar production`: 
+  - If no battery is connected to an inverter: Add each inverters `Energy total` entity.
+  - If a battery is connected to an inverter: Use [Riemann sum](/integrations/integration/) over `Power photovoltaics` entity (from power_flow endpoint found in your `SolarNet` device)
+- `Battery systems` aren't supported directly. Use [Template](/integrations/template) to split and invert negative values of `Power battery` entity (from power_flow) for charging power (W) and positive values for discharging power (W). Then use [Riemann sum](/integrations/integration/) to integrate each into energy values (kWh).
 - For `Devices` use the Ohmpilots `Energy consumed` entity.
 
 ## Note