diff --git a/lib/ShortDev.Microsoft.ConnectedDevices/EndpointInfo.cs b/lib/ShortDev.Microsoft.ConnectedDevices/EndpointInfo.cs
index f8f08839..87790ded 100644
--- a/lib/ShortDev.Microsoft.ConnectedDevices/EndpointInfo.cs
+++ b/lib/ShortDev.Microsoft.ConnectedDevices/EndpointInfo.cs
@@ -22,9 +22,6 @@ public IPEndPoint ToIPEndPoint()
         return new(ipAddress, port);
     }
 
-    public static EndpointInfo FromTcp(IPEndPoint endpoint)
-        => FromTcp(endpoint.Address, endpoint.Port);
-
     public static EndpointInfo FromTcp(IPAddress address, int port = Constants.TcpPort)
     => FromTcp(address.ToString(), port);
 
diff --git a/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs b/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs
index a299ba29..6042757b 100644
--- a/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs
+++ b/lib/ShortDev.Microsoft.ConnectedDevices/Transports/Network/NetworkTransport.cs
@@ -107,12 +107,12 @@ public async Task Advertise(LocalDeviceInfo deviceInfo, CancellationToken cancel
             DiscoveryMessageReceived -= OnMessage;
         }
 
-        void OnMessage(IPEndPoint remoteEndPoint, DiscoveryHeader header, EndianReader reader)
+        void OnMessage(IPAddress address, DiscoveryHeader header, EndianReader reader)
         {
             if (header.Type != DiscoveryType.PresenceRequest)
                 return;
 
-            SendPresenceResponse(remoteEndPoint.Address, presenceResponse);
+            SendPresenceResponse(address, presenceResponse);
         }
     }
 
@@ -143,7 +143,7 @@ async Task RunPresenceSendLoop()
             }
         }
 
-        void OnMessage(IPEndPoint remoteEndPoint, DiscoveryHeader header, EndianReader reader)
+        void OnMessage(IPAddress address, DiscoveryHeader header, EndianReader reader)
         {
             if (header.Type != DiscoveryType.PresenceResponse)
                 return;
@@ -154,13 +154,13 @@ void OnMessage(IPEndPoint remoteEndPoint, DiscoveryHeader header, EndianReader r
                 new CdpDevice(
                     response.DeviceName,
                     response.DeviceType,
-                    EndpointInfo.FromTcp(remoteEndPoint)
+                    EndpointInfo.FromTcp(address)
                 )
             );
         }
     }
 
-    delegate void DiscoveryMessageReceivedHandler(IPEndPoint remoteEndPoint, DiscoveryHeader header, EndianReader reader);
+    delegate void DiscoveryMessageReceivedHandler(IPAddress address, DiscoveryHeader header, EndianReader reader);
     event DiscoveryMessageReceivedHandler? DiscoveryMessageReceived;
 
     bool _isListening;
@@ -199,7 +199,7 @@ void HandleMsg(UdpReceiveResult result)
                 return;
 
             DiscoveryHeader discoveryHeaders = DiscoveryHeader.Parse(ref reader);
-            DiscoveryMessageReceived?.Invoke(result.RemoteEndPoint, discoveryHeaders, reader);
+            DiscoveryMessageReceived?.Invoke(result.RemoteEndPoint.Address, discoveryHeaders, reader);
         }
     }
     #endregion