Update Tunnel Protocol fallback handling

Remove "any" as fallback value.

3 files changed, 7 insertions, 8 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx
index 997d3956be..a3b0174e98 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx
@@ -722,7 +722,7 @@ function TunnelProtocolSetting() {
       <Selector
         title={messages.pgettext('vpn-settings-view', 'Tunnel protocol')}
         items={tunnelProtocolItems}
-        value={tunnelProtocol ?? null}
+        value={tunnelProtocol}
         onSelect={setTunnelProtocol}
       />
       {openVpnDisabled ? (
@@ -747,7 +747,7 @@ function TunnelProtocolSetting() {
 function mapRelaySettingsToProtocol(relaySettings: RelaySettingsRedux) {
   if ('normal' in relaySettings) {
     const { tunnelProtocol } = relaySettings.normal;
-    return tunnelProtocol === 'any' ? undefined : tunnelProtocol;
+    return tunnelProtocol;
     // since the GUI doesn't display custom settings, just display the default ones.
     // If the user sets any settings, then those will be applied.
   } else if ('customTunnelEndpoint' in relaySettings) {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/filter-locations.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/filter-locations.ts
index 3b55639a8d..f4725a4d92 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/filter-locations.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/filter-locations.ts
@@ -83,11 +83,6 @@ function getTunnelProtocolFilter(
   const endpointTypes: Array<RelayEndpointType> = [];
   if (endpointType !== EndpointType.exit && tunnelProtocol === 'openvpn') {
     endpointTypes.push('bridge');
-  } else if (tunnelProtocol === 'any') {
-    endpointTypes.push('wireguard');
-    if (!relaySettings?.wireguard.useMultihop) {
-      endpointTypes.push('openvpn');
-    }
   } else {
     endpointTypes.push(tunnelProtocol);
   }
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/relay-settings-hooks.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/relay-settings-hooks.ts
index 14457ab6b5..d6db9ea4c0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/relay-settings-hooks.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/relay-settings-hooks.ts
@@ -16,7 +16,11 @@ export function useTunnelProtocol(): TunnelProtocol {
   const quantumResistant = useSelector((state) => state.settings.wireguard.quantumResistant);
   const openVpnDisabled = daita || multihop || quantumResistant;
 
-  return openVpnDisabled ? 'wireguard' : (relaySettings?.tunnelProtocol ?? 'any');
+  if (openVpnDisabled || relaySettings?.tunnelProtocol === undefined) {
+    return 'wireguard';
+  }
+
+  return relaySettings.tunnelProtocol;
 }
 
 export function useNormalBridgeSettings() {