diff --git a/core/src/main/java/haveno/core/api/XmrConnectionService.java b/core/src/main/java/haveno/core/api/XmrConnectionService.java
index 0cc66c7475..5b48c41a0e 100644
--- a/core/src/main/java/haveno/core/api/XmrConnectionService.java
+++ b/core/src/main/java/haveno/core/api/XmrConnectionService.java
@@ -3,7 +3,6 @@ package haveno.core.api;
 import haveno.common.ThreadUtils;
 import haveno.common.UserThread;
 import haveno.common.app.DevEnv;
-import haveno.common.config.BaseCurrencyNetwork;
 import haveno.common.config.Config;
 import haveno.core.trade.HavenoUtils;
 import haveno.core.user.Preferences;
@@ -612,8 +611,7 @@ public final class XmrConnectionService {
                     chainHeight.set(lastInfo.getHeight());
 
                     // update sync progress
-                    boolean isTestnet = Config.baseCurrencyNetwork() == BaseCurrencyNetwork.XMR_LOCAL;
-                    if (lastInfo.isSynchronized() || isTestnet) doneDownload(); // TODO: skipping synchronized check for testnet because tests cannot sync 3rd local node, see "Can manage Monero daemon connections"
+                    if (lastInfo.isSynchronized()) doneDownload();
                     else if (lastInfo.isBusySyncing()) {
                         long targetHeight = lastInfo.getTargetHeight();
                         long blocksLeft = targetHeight - lastInfo.getHeight();
diff --git a/core/src/main/java/haveno/core/api/XmrLocalNode.java b/core/src/main/java/haveno/core/api/XmrLocalNode.java
index c927ae3f50..799427ea63 100644
--- a/core/src/main/java/haveno/core/api/XmrLocalNode.java
+++ b/core/src/main/java/haveno/core/api/XmrLocalNode.java
@@ -61,6 +61,8 @@ public class XmrLocalNode {
         MONEROD_ARGS.add(MONEROD_PATH);
         MONEROD_ARGS.add("--no-igd");
         MONEROD_ARGS.add("--hide-my-port");
+        MONEROD_ARGS.add("--p2p-bind-ip");
+        MONEROD_ARGS.add(HavenoUtils.LOOPBACK_HOST);
         if (!Config.baseCurrencyNetwork().isMainnet()) MONEROD_ARGS.add("--" + Config.baseCurrencyNetwork().getNetwork().toLowerCase());
     }
 
diff --git a/core/src/main/java/haveno/core/xmr/XmrNodeSettings.java b/core/src/main/java/haveno/core/xmr/XmrNodeSettings.java
index 8be7a575fd..14a58104ce 100644
--- a/core/src/main/java/haveno/core/xmr/XmrNodeSettings.java
+++ b/core/src/main/java/haveno/core/xmr/XmrNodeSettings.java
@@ -50,7 +50,7 @@ public class XmrNodeSettings implements PersistableEnvelope {
     public protobuf.XmrNodeSettings toProtoMessage() {
         protobuf.XmrNodeSettings.Builder builder = protobuf.XmrNodeSettings.newBuilder();
         Optional.ofNullable(blockchainPath).ifPresent(e -> builder.setBlockchainPath(blockchainPath));
-        Optional.ofNullable(bootstrapUrl).ifPresent(e -> builder.setBlockchainPath(bootstrapUrl));
+        Optional.ofNullable(bootstrapUrl).ifPresent(e -> builder.setBootstrapUrl(bootstrapUrl));
         Optional.ofNullable(startupFlags).ifPresent(e -> builder.addAllStartupFlags(startupFlags));
         return builder.build();
     }