diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
index 3342ace1..7deb0155 100644
--- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java
+++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
@@ -360,7 +360,7 @@ public class ComputerManagerService extends Service {
             // Since we're on the same network, we can use STUN to find
             // our WAN address, which is also very likely the WAN address
             // of the PC. We can use this later to connect remotely.
-            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns();
+            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
         }
 
         // Block while we try to fill the details
diff --git a/moonlight-common b/moonlight-common
index 6bed1cd2..05f344ab 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 6bed1cd22e63e44c63fc37a55b10e33aeabb7892
+Subproject commit 05f344abbe22c30dfff9fed94fc05ff995057af7