diff --git a/MediaBrowser.Controller/Dlna/SsdpMessageEventArgs.cs b/MediaBrowser.Controller/Dlna/SsdpMessageEventArgs.cs
index 63f3a67aa0..804f34311a 100644
--- a/MediaBrowser.Controller/Dlna/SsdpMessageEventArgs.cs
+++ b/MediaBrowser.Controller/Dlna/SsdpMessageEventArgs.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Controller.Dlna
 
         public Dictionary<string, string> Headers { get; set; }
 
-        public IPAddress LocalIp { get; set; }
+        public IPEndPoint LocalEndPoint { get; set; }
         public byte[] Message { get; set; }
 
         public SsdpMessageEventArgs()
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index b5b63181a0..fa5841bb83 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -108,9 +108,9 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         {
             var endpoint = e.EndPoint as IPEndPoint;
 
-            if (endpoint != null && e.LocalIp != null)
+            if (endpoint != null && e.LocalEndPoint != null)
             {
-                NatUtility.Handle(e.LocalIp, e.Message, endpoint, NatProtocol.Upnp);
+                NatUtility.Handle(e.LocalEndPoint.Address, e.Message, endpoint, NatProtocol.Upnp);
             }
         }