diff --git a/core/src/main/java/io/bisq/core/btc/BitcoinNodes.java b/core/src/main/java/io/bisq/core/btc/BitcoinNodes.java
index c231f4e4c7..07d3256d93 100644
--- a/core/src/main/java/io/bisq/core/btc/BitcoinNodes.java
+++ b/core/src/main/java/io/bisq/core/btc/BitcoinNodes.java
@@ -57,7 +57,7 @@ public class BitcoinNodes {
     }
 
     public boolean useProvidedBtcNodes() {
-        return BisqEnvironment.getBaseCurrencyNetwork().isBitcoin() && BisqEnvironment.getBaseCurrencyNetwork().isBitcoin();
+        return BisqEnvironment.getBaseCurrencyNetwork().isBitcoin() && BisqEnvironment.getBaseCurrencyNetwork().isMainnet();
     }
 
     @Getter
diff --git a/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java
index 8ed881098f..12e41b462e 100644
--- a/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java
+++ b/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java
@@ -177,6 +177,10 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
             selectedBitcoinNodesOption = BitcoinNodes.BitcoinNodesOption.PROVIDED;
             preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal());
         }
+        if (!bitcoinNodes.useProvidedBtcNodes()) {
+            selectedBitcoinNodesOption = BitcoinNodes.BitcoinNodesOption.PUBLIC;
+            preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal());
+        }
 
         selectBitcoinPeersToggle();
         onBitcoinPeersToggleSelected(false);
@@ -378,7 +382,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
                     btcNodesLabel.setDisable(true);
                     if (calledFromUser)
                         showShutDownPopup();
-                }else{
+                } else {
                     selectedBitcoinNodesOption = BitcoinNodes.BitcoinNodesOption.PUBLIC;
                     preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal());
                     selectBitcoinPeersToggle();
diff --git a/network/src/main/java/io/bisq/network/Socks5MultiDiscovery.java b/network/src/main/java/io/bisq/network/Socks5MultiDiscovery.java
index 20d7680d5d..d00b55c1de 100644
--- a/network/src/main/java/io/bisq/network/Socks5MultiDiscovery.java
+++ b/network/src/main/java/io/bisq/network/Socks5MultiDiscovery.java
@@ -23,6 +23,7 @@ import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.net.discovery.PeerDiscovery;
 import org.bitcoinj.net.discovery.PeerDiscoveryException;
 import org.bitcoinj.net.discovery.SeedPeers;
+import org.bitcoinj.params.MainNetParams;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -59,7 +60,8 @@ public class Socks5MultiDiscovery implements PeerDiscovery {
         if ((mode & SOCKS5_DISCOVER_ONION) != 0)
             discoveryList.add(new Socks5SeedOnionDiscovery(proxy, params));
 
-        if ((mode & SOCKS5_DISCOVER_ADDR) != 0)
+        // Testnet has no addrSeeds so SeedPeers is not supported (would throw a nullPointer)
+        if ((mode & SOCKS5_DISCOVER_ADDR) != 0 && params == MainNetParams.get())
             // note:  SeedPeers does not perform any network operations, so does not use proxy.
             discoveryList.add(new SeedPeers(params));