diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml
index 7066abb3..e779ef65 100644
--- a/nymea-app/ui/SettingsPage.qml
+++ b/nymea-app/ui/SettingsPage.qml
@@ -59,6 +59,7 @@ Page {
             Pane {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
+                visible: engine.jsonRpcClient.ensureServerVersion("1.9")
 
                 padding: 0
                 MeaListItemDelegate {
@@ -68,7 +69,6 @@ Page {
                     subText: qsTr("Connect this box to %1:cloud").arg(app.systemName)
                     prominentSubText: false
                     wrapTexts: false
-                    visible: engine.jsonRpcClient.ensureServerVersion("1.9")
                     onClicked: pageStack.push(Qt.resolvedUrl("system/CloudSettingsPage.qml"))
                 }
             }
@@ -92,6 +92,7 @@ Page {
             Pane {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
+                visible: engine.jsonRpcClient.ensureServerVersion("1.11")
 
                 padding: 0
                 MeaListItemDelegate {
@@ -101,7 +102,6 @@ Page {
                     subText: qsTr("Configure the MQTT broker")
                     prominentSubText: false
                     wrapTexts: false
-                    visible: engine.jsonRpcClient.ensureServerVersion("1.11")
                     onClicked: pageStack.push(Qt.resolvedUrl("system/MqttBrokerSettingsPage.qml"))
                 }
             }
diff --git a/nymea-app/ui/connection/ConnectingPage.qml b/nymea-app/ui/connection/ConnectingPage.qml
index 84ac3bb2..7d4c49f6 100644
--- a/nymea-app/ui/connection/ConnectingPage.qml
+++ b/nymea-app/ui/connection/ConnectingPage.qml
@@ -16,7 +16,7 @@ Page {
         height: app.iconSize
         width: height
         name: "../images/logs.svg"
-        visible: settings.showHiddenOptions
+        visible: settings.showHiddenOptions && AppLogController.enabled
         MouseArea {
             anchors.fill: parent
             onClicked: {