diff --git a/src/main/scala/scorex/core/network/NetworkController.scala b/src/main/scala/scorex/core/network/NetworkController.scala
index 993e5081d..960fd4d81 100644
--- a/src/main/scala/scorex/core/network/NetworkController.scala
+++ b/src/main/scala/scorex/core/network/NetworkController.scala
@@ -80,7 +80,9 @@ class NetworkController(settings: NetworkSettings,
         Try(InetAddress.getByName(address)).map(address =>
           new InetSocketAddress(address, port.toInt)).toOption
       }).orElse {
-      if (settings.upnpEnabled) upnp.externalAddress else None
+      if (settings.upnpEnabled) {
+        upnp.externalAddress.map(a => new InetSocketAddress(a, settings.port))
+      } else None
     }
   }