diff --git a/core/src/main/java/haveno/core/api/XmrConnectionService.java b/core/src/main/java/haveno/core/api/XmrConnectionService.java
index b49de52b62..db970c0494 100644
--- a/core/src/main/java/haveno/core/api/XmrConnectionService.java
+++ b/core/src/main/java/haveno/core/api/XmrConnectionService.java
@@ -588,7 +588,7 @@ public final class XmrConnectionService {
 
                 // restore auto switch
                 if (coreContext.isApiUser()) connectionManager.setAutoSwitch(connectionList.getAutoSwitch());
-                else connectionManager.setAutoSwitch(true);
+                else connectionManager.setAutoSwitch(true); // auto switch is always enabled on desktop ui
 
                 // start local node if applicable
                 maybeStartLocalNode();
diff --git a/core/src/main/java/haveno/core/xmr/model/EncryptedConnectionList.java b/core/src/main/java/haveno/core/xmr/model/EncryptedConnectionList.java
index 9b49e3e96f..b0cc843121 100644
--- a/core/src/main/java/haveno/core/xmr/model/EncryptedConnectionList.java
+++ b/core/src/main/java/haveno/core/xmr/model/EncryptedConnectionList.java
@@ -62,7 +62,7 @@ public class EncryptedConnectionList implements PersistableEnvelope, PersistedDa
     private final Map<String, EncryptedConnection> items = new HashMap<>();
     private @NonNull String currentConnectionUrl = "";
     private long refreshPeriod; // -1 means no refresh, 0 means default, >0 means custom
-    private boolean autoSwitch;
+    private boolean autoSwitch = true;
 
     @Inject
     public EncryptedConnectionList(PersistenceManager<EncryptedConnectionList> persistenceManager,