diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py
index 0d205b97..aa2344db 100644
--- a/cli/onionshare_cli/onion.py
+++ b/cli/onionshare_cli/onion.py
@@ -199,8 +199,6 @@ class Onion(object):
             )
             return
 
-        self.common.log("Onion", "connect")
-
         # Either use settings that are passed in, or use them from common
         if custom_settings:
             self.settings = custom_settings
@@ -211,6 +209,12 @@ class Onion(object):
             self.common.load_settings()
             self.settings = self.common.settings
 
+        self.common.log(
+            "Onion",
+            "connect",
+            f"connection_type={self.settings.get('connection_type')}",
+        )
+
         # The Tor controller
         self.c = None
 
diff --git a/desktop/src/onionshare/tor_settings_tab.py b/desktop/src/onionshare/tor_settings_tab.py
index df7cf3be..a56d360b 100644
--- a/desktop/src/onionshare/tor_settings_tab.py
+++ b/desktop/src/onionshare/tor_settings_tab.py
@@ -799,7 +799,10 @@ class TorSettingsTab(QtWidgets.QWidget):
                 settings.set("tor_bridges_use_moat", True)
 
                 moat_bridges = self.bridge_moat_textbox.toPlainText()
-                if moat_bridges.strip() == "":
+                if (
+                    self.connection_type_bundled_radio.isChecked()
+                    and moat_bridges.strip() == ""
+                ):
                     self.error_label.setText(
                         strings._("gui_settings_moat_bridges_invalid")
                     )