diff --git a/nymea-app/translations/nymea-app-de.ts b/nymea-app/translations/nymea-app-de.ts
index 3cdb248d..1cb1f625 100644
--- a/nymea-app/translations/nymea-app-de.ts
+++ b/nymea-app/translations/nymea-app-de.ts
@@ -1776,12 +1776,16 @@
     </message>
     <message>
         <source>Root meter</source>
-        <translation>Wuzelmesser</translation>
+        <translation>Wurzelmesser</translation>
     </message>
     <message>
         <source>Consumers</source>
         <translation>Verbraucher</translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation>Entferne das Häkchen bei einzelnen Verbrauchern um diese in den Energieansichten auszublenden.</translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
@@ -5147,7 +5151,7 @@ Möchtest Du fortfahren?</translation>
     <name>PowerBalanceStats</name>
     <message>
         <source>Totals</source>
-        <translation>Gesamt</translation>
+        <translation>Gesamtsummen</translation>
     </message>
     <message>
         <source>Hours</source>
diff --git a/nymea-app/translations/nymea-app-en.ts b/nymea-app/translations/nymea-app-en.ts
index d933803b..51b54f79 100644
--- a/nymea-app/translations/nymea-app-en.ts
+++ b/nymea-app/translations/nymea-app-en.ts
@@ -1776,6 +1776,10 @@
         <source>Consumers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
diff --git a/nymea-app/translations/nymea-app-en_US.ts b/nymea-app/translations/nymea-app-en_US.ts
index 2b2dd48c..2db1409a 100644
--- a/nymea-app/translations/nymea-app-en_US.ts
+++ b/nymea-app/translations/nymea-app-en_US.ts
@@ -1776,6 +1776,10 @@
         <source>Consumers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
diff --git a/nymea-app/translations/nymea-app-it.ts b/nymea-app/translations/nymea-app-it.ts
index 22a880d7..f3e3fc16 100644
--- a/nymea-app/translations/nymea-app-it.ts
+++ b/nymea-app/translations/nymea-app-it.ts
@@ -1776,6 +1776,10 @@
         <source>Consumers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
diff --git a/nymea-app/translations/nymea-app-ko.ts b/nymea-app/translations/nymea-app-ko.ts
index 4a7b143b..20244fd1 100644
--- a/nymea-app/translations/nymea-app-ko.ts
+++ b/nymea-app/translations/nymea-app-ko.ts
@@ -1780,6 +1780,10 @@
         <source>Consumers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
diff --git a/nymea-app/translations/nymea-app-nl.ts b/nymea-app/translations/nymea-app-nl.ts
index 60a60064..12b1070d 100644
--- a/nymea-app/translations/nymea-app-nl.ts
+++ b/nymea-app/translations/nymea-app-nl.ts
@@ -1776,6 +1776,10 @@
         <source>Consumers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
diff --git a/nymea-app/translations/nymea-app-tr.ts b/nymea-app/translations/nymea-app-tr.ts
index db3877f9..cad5483f 100644
--- a/nymea-app/translations/nymea-app-tr.ts
+++ b/nymea-app/translations/nymea-app-tr.ts
@@ -1780,6 +1780,10 @@
         <source>Consumers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
diff --git a/nymea-app/translations/nymea-app-vi.ts b/nymea-app/translations/nymea-app-vi.ts
index 6bd387a4..c831daf0 100644
--- a/nymea-app/translations/nymea-app-vi.ts
+++ b/nymea-app/translations/nymea-app-vi.ts
@@ -1774,6 +1774,10 @@
         <source>Consumers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Uncheck individual consumers to hide them from the energy charts.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnergyView</name>
diff --git a/nymea-app/ui/MainMenu.qml b/nymea-app/ui/MainMenu.qml
index 5f71c067..33b7e9ec 100644
--- a/nymea-app/ui/MainMenu.qml
+++ b/nymea-app/ui/MainMenu.qml
@@ -139,7 +139,7 @@ Drawer {
                     Layout.fillWidth: true
                     text: qsTr("Configure things")
                     iconName: "../images/things.svg"
-                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost
+                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost && root.currentEngine.jsonRpcClient.connected
                     progressive: false
                     onClicked: {
                         root.openThingSettings()
@@ -151,7 +151,7 @@ Drawer {
                     text: qsTr("Magic")
                     iconName: "../images/magic.svg"
                     progressive: false
-                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost
+                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost && root.currentEngine.jsonRpcClient.connected
                     onClicked: {
                         root.openMagicSettings();
                         root.close();
@@ -162,7 +162,7 @@ Drawer {
                     text: qsTr("Configure main view")
                     iconName: "../images/configure.svg"
                     progressive: false
-                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost &&
+                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost && root.currentEngine.jsonRpcClient.connected &&
                              !Configuration.hasOwnProperty("mainViewsFilter")
                     onClicked: {
                         root.configureMainView();
@@ -184,7 +184,7 @@ Drawer {
                     text: qsTr("System settings")
                     iconName: "../images/settings.svg"
                     progressive: false
-                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost
+                    visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost && root.currentEngine.jsonRpcClient.connected
                     onClicked: {
                         root.openSystemSettings();
                         root.close();
diff --git a/nymea-app/ui/mainviews/EnergyView.qml b/nymea-app/ui/mainviews/EnergyView.qml
index 1eed5d70..5e155029 100644
--- a/nymea-app/ui/mainviews/EnergyView.qml
+++ b/nymea-app/ui/mainviews/EnergyView.qml
@@ -51,7 +51,7 @@ MainViewBase {
             trigger: function() {
                 pageStack.push("energy/EnergySettingsPage.qml", {energyManager: energyManager});
             },
-            visible: true
+            visible: energyMeters.count > 1 || consumers.count > 0
         }
     ]
 
diff --git a/nymea-app/ui/mainviews/energy/ConsumerStats.qml b/nymea-app/ui/mainviews/energy/ConsumerStats.qml
index 0694fcd5..e58daa3a 100644
--- a/nymea-app/ui/mainviews/energy/ConsumerStats.qml
+++ b/nymea-app/ui/mainviews/energy/ConsumerStats.qml
@@ -239,6 +239,11 @@ StatsBase {
             var previous = powerLogs.find(entry.thingId, new Date(categoryAxis.timestamps[categoryAxis.timestamps.length - 1]))
             var previousValue = previous ? previous.totalConsumption : 0
             var barSet = barSeries.thingBarSetMap[entry.thingId]
+
+            if (!barSet) {
+                return
+            }
+
             barSet.replace(barSet.count - 1, entry.totalConsumption - previousValue)
         }
     }
diff --git a/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml b/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml
index d6f6545b..5b3d791d 100644
--- a/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml
+++ b/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml
@@ -59,6 +59,16 @@ SettingsPageBase {
 
     SettingsPageSectionHeader {
         text: qsTr("Consumers")
+        visible: root.allConsumers.count > 0
+    }
+
+    Label {
+        Layout.fillWidth: true
+        Layout.leftMargin: Style.margins
+        Layout.rightMargin: Style.margins
+        wrapMode: Text.WordWrap
+        text: qsTr("Uncheck individual consumers to hide them from the energy charts.")
+        visible: root.allConsumers.count > 0
     }
 
     Repeater {