diff --git a/pages/Settings.qml b/pages/Settings.qml
index 1e753651..c4df7288 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -248,7 +248,7 @@ Rectangle {
         }
 
         GridLayout {
-            visible: !isMobile
+            visible: !isMobile && !persistentSettings.useRemoteNode
             id: daemonStatusRow
             columns: (isMobile) ?  2 : 4
             StandardButton {
@@ -325,7 +325,7 @@ Rectangle {
 
 
         RowLayout {
-            visible: daemonAdvanced.checked && !isMobile
+            visible: daemonAdvanced.checked && !isMobile && !persistentSettings.useRemoteNode
             id: daemonFlagsRow
             Label {
                 id: daemonFlagsLabel
@@ -343,7 +343,7 @@ Rectangle {
 
         RowLayout {
             Layout.fillWidth: true
-            visible: daemonAdvanced.checked || isMobile
+            visible: (daemonAdvanced.checked || isMobile) && persistentSettings.useRemoteNode
             Label {
                 id: daemonLoginLabel
                 Layout.fillWidth: true
@@ -354,7 +354,7 @@ Rectangle {
         }
 
         ColumnLayout {
-            visible: daemonAdvanced.checked || isMobile
+            visible: (daemonAdvanced.checked || isMobile) && persistentSettings.useRemoteNode
             LineEdit {
                 id: daemonUsername
                 Layout.preferredWidth:  100 * scaleRatio
diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml
index dd41172c..8634f652 100644
--- a/wizard/WizardDaemonSettings.qml
+++ b/wizard/WizardDaemonSettings.qml
@@ -130,6 +130,10 @@ ColumnLayout {
                 uncheckedIcon: "../images/uncheckedIcon.png"
                 checked: !appWindow.persistentSettings.useRemoteNode && !isAndroid && !isIOS
                 visible: !isAndroid && !isIOS
+                onClicked: {
+                    checked = true;
+                    remoteNode.checked = false;
+                }
             }
         }
 
@@ -175,6 +179,10 @@ ColumnLayout {
                 checkedIcon: "../images/checkedVioletIcon.png"
                 uncheckedIcon: "../images/uncheckedIcon.png"
                 checked: appWindow.persistentSettings.useRemoteNode
+                onClicked: {
+                    checked = true
+                    localNode.checked = false
+                }
             }
 
         }