3 files changed, 6 insertions, 6 deletions
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index f067a3908b..3e64545f44 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -454,7 +454,7 @@ impl<C: OpenVpnBuilder + 'static> OpenVpnMonitor<C> {
                 .compat()
                 .map_err(Error::IpRouteNotFound)?,
         );
-        cmd.remote(params.config.get_tunnel_endpoint().endpoint)
+        cmd.remote(params.config.endpoint)
             .user_pass(user_pass_file)
             .tunnel_options(&params.options)
             .enable_ipv6(params.generic_options.enable_ipv6)
diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs
index bc1ca6d4af..7421ef42eb 100644
--- a/talpid-core/src/tunnel_state_machine/connected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connected_state.rs
@@ -61,11 +61,11 @@ impl ConnectedState {
 
     fn get_endpoint_from_params(&self) -> Endpoint {
         match self.tunnel_parameters {
-            TunnelParameters::OpenVpn(ref config) => match config.proxy {
-                Some(ref proxy_settings) => proxy_settings.get_endpoint(),
-                None => self.tunnel_parameters.get_tunnel_endpoint().endpoint,
+            TunnelParameters::OpenVpn(ref params) => match params.proxy {
+                Some(ref proxy_settings) => proxy_settings.get_endpoint().endpoint,
+                None => params.config.endpoint,
             },
-            _ => self.tunnel_parameters.get_tunnel_endpoint().endpoint,
+            TunnelParameters::Wireguard(ref params) => params.connection.get_endpoint(),
         }
     }
 
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index c82ad27f73..94eebdf818 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -48,7 +48,7 @@ impl ConnectingState {
         let endpoint = params.get_tunnel_endpoint().endpoint;
 
         let peer_endpoint = match proxy {
-            Some(proxy_settings) => proxy_settings.get_endpoint(),
+            Some(proxy_settings) => proxy_settings.get_endpoint().endpoint,
             None => endpoint,
         };