diff --git a/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml b/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml
index 5952414c..9e9f9769 100644
--- a/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml
+++ b/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml
@@ -16,6 +16,11 @@ Item {
         sampleRate: EnergyLogs.SampleRate15Mins
     }
 
+    property ThingsProxy batteries: ThingsProxy {
+        engine: _engine
+        shownInterfaces: ["energystorage"]
+    }
+
     Component.onCompleted: {
         for (var i = 0; i < powerBalanceLogs.count; i++) {
             var entry = energyLogs.powerBalanceLogs.get(i);
@@ -196,7 +201,7 @@ Item {
             borderWidth: 0
             borderColor: color
             name: qsTr("From battery")
-    //      visible: false
+            visible: root.batteries.count > 0
 
             lowerSeries: selfProductionUpperSeries
             upperSeries: LineSeries {
@@ -324,6 +329,7 @@ Item {
                     }
                 }
                 RowLayout {
+                    visible: root.batteries.count > 0
                     Rectangle {
                         width: Style.extraSmallFont.pixelSize
                         height: width
diff --git a/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml b/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml
index c6417368..5ab5f352 100644
--- a/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml
+++ b/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml
@@ -14,6 +14,11 @@ Item {
         startTime: dateTimeAxis.min
     }
 
+    property ThingsProxy batteries: ThingsProxy {
+        engine: _engine
+        shownInterfaces: ["energystorage"]
+    }
+
     Component.onCompleted: {
         for (var i = 0; i < powerBalanceLogs.count; i++) {
             var entry = energyLogs.powerBalanceLogs.get(i);
@@ -187,7 +192,7 @@ Item {
             color: Style.orange
             borderWidth: 0
             borderColor: color
-    //        visible: false
+            visible: root.batteries.count > 0
             name: qsTr("To battery")
 
 
@@ -314,6 +319,7 @@ Item {
                     }
                 }
                 RowLayout {
+                    visible: root.batteries.count > 0
                     Rectangle {
                         width: Style.extraSmallFont.pixelSize
                         height: width