diff --git a/nymea-app/ui/MainMenu.qml b/nymea-app/ui/MainMenu.qml
index d56f720b..5f71c067 100644
--- a/nymea-app/ui/MainMenu.qml
+++ b/nymea-app/ui/MainMenu.qml
@@ -87,7 +87,7 @@ Drawer {
                             }
                             ProgressButton {
                                 imageSource: "/ui/images/close.svg"
-                                visible: topSectionLayout.configureConnections
+                                visible: topSectionLayout.configureConnections && (autoConnectHost.length === 0 || index > 0)
                                 longpressEnabled: false
                                 onClicked: {
                                     configuredHostsModel.removeHost(index)
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index d6e27334..6734cb84 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -129,7 +129,7 @@ Item {
                                 return;
                             }
                             print("Warning: There is a last connected host but UUID is unknown to discovery...")
-                        } else if (autoConnectHost.length > 0) {
+                        } else if (autoConnectHost.length > 0 && index === 0) {
                             var host = nymeaDiscovery.nymeaHosts.createLanHost(Configuration.systemName, autoConnectHost);
                             engine.jsonRpcClient.connectToHost(host)
                             return;