diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml
index ad15932c..e234abfd 100644
--- a/nymea-app/ui/SettingsPage.qml
+++ b/nymea-app/ui/SettingsPage.qml
@@ -152,23 +152,6 @@ Page {
                 }
             }
 
-            Pane {
-                Layout.fillWidth: true
-                Material.elevation: layout.isGrid ? 1 : 0
-                visible: engine.jsonRpcClient.ensureServerVersion("5.3")
-
-                padding: 0
-                NymeaSwipeDelegate {
-                    width: parent.width
-                    iconName: "../images/zigbee.svg"
-                    text: qsTr("ZigBee")
-                    subText: qsTr("Configure ZigBee networks")
-                    prominentSubText: false
-                    wrapTexts: false
-                    onClicked: pageStack.push(Qt.resolvedUrl("system/ZigbeeSettingsPage.qml"))
-                }
-            }
-
             Pane {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
@@ -189,7 +172,24 @@ Page {
             Pane {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
-                visible: engine.jsonRpcClient.ensureServerVersion("5.4")
+                visible: engine.jsonRpcClient.ensureServerVersion("5.3")
+
+                padding: 0
+                NymeaSwipeDelegate {
+                    width: parent.width
+                    iconName: "../images/zigbee.svg"
+                    text: qsTr("ZigBee")
+                    subText: qsTr("Configure ZigBee networks")
+                    prominentSubText: false
+                    wrapTexts: false
+                    onClicked: pageStack.push(Qt.resolvedUrl("system/ZigbeeSettingsPage.qml"))
+                }
+            }
+
+            Pane {
+                Layout.fillWidth: true
+                Material.elevation: layout.isGrid ? 1 : 0
+                visible: engine.jsonRpcClient.ensureServerVersion("5.6")
 
                 padding: 0
                 NymeaSwipeDelegate {
diff --git a/nymea-app/ui/system/ModbusRtuReconfigureMasterPage.qml b/nymea-app/ui/system/ModbusRtuReconfigureMasterPage.qml
index fc880305..7f2e6037 100644
--- a/nymea-app/ui/system/ModbusRtuReconfigureMasterPage.qml
+++ b/nymea-app/ui/system/ModbusRtuReconfigureMasterPage.qml
@@ -141,7 +141,7 @@ SettingsPageBase {
             NymeaSwipeDelegate {
                 Layout.fillWidth: true
                 text: qsTr("Description")
-                subText: serialPort.description
+                subText: serialPort.description.length > 0 ? serialPort.description : qsTr("Unknown")
                 progressive: false
                 prominentSubText: false
             }