diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java
index bb5a06c4b4682d480b9e129be880ce0854981874..5cd6c2a0b138bbd7767aa489e832ee2a49dbb09d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java
@@ -48,8 +48,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.ref.WeakReference;
 import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
 
 import de.blinkt.openvpn.core.VpnStatus;
 import de.blinkt.openvpn.core.connection.Connection;
@@ -144,10 +142,11 @@ public class GatewaySelectionFragment extends Fragment implements PropertyChange
     }
 
     private void initBridgesHint(@NonNull View view) {
+        boolean allowResettingBridges = getUseBridges() && gatewaysManager.hasLocationsForOpenVPN();
         bridgesHint = view.findViewById(R.id.manual_subtitle);
-        bridgesHint.setVisibility(getUseBridges() ? VISIBLE : GONE);
+        bridgesHint.setVisibility(allowResettingBridges ? VISIBLE : GONE);
         disableBridges = view.findViewById(R.id.disable_bridges);
-        disableBridges.setVisibility(getUseBridges() ? VISIBLE : GONE);
+        disableBridges.setVisibility(allowResettingBridges ? VISIBLE : GONE);
         disableBridges.setOnClickListener(v -> {
             useBridges(false);
         });
@@ -218,6 +217,7 @@ public class GatewaySelectionFragment extends Fragment implements PropertyChange
             locationListAdapter.updateTransport(selectedTransport, gatewaysManager);
             bridgesHint.setVisibility(showBridges ? VISIBLE : GONE);
             disableBridges.setVisibility(showBridges ? VISIBLE : GONE);
+            updateRecommendedLocation();
         }
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
index 16f12e024202bc1c3b121930b9f0bd99a3e8a621..b207fb14572c50263255f106f147a064a8a77b48 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -314,6 +314,15 @@ public class GatewaysManager {
         return null;
     }
 
+    public boolean hasLocationsForOpenVPN() {
+        for (Gateway gateway : gateways.values()) {
+            if (gateway.supportsTransport(OPENVPN, null)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public Load getLoadForLocation(@Nullable String name, TransportType transportType) {
         Location location = getLocation(name);
         if (location == null) {