diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
index f253b9cd..940d34aa 100644
--- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java
+++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
@@ -302,16 +302,16 @@ public class ComputerManagerService extends Service {
                 // Populate the computer template with mDNS info
                 if (computer.getAddressV4() != null) {
                     details.localAddress = computer.getAddressV4().getHostAddress();
+
+                    // 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.
+                    details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
                 }
                 if (computer.getAddressV6() != null) {
                     details.ipv6Address = computer.getAddressV6().getHostAddress();
                 }
 
-                // 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.
-                details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
-
                 // Kick off a serverinfo poll on this machine
                 if (!addComputerBlocking(details)) {
                     LimeLog.warning("Auto-discovered PC failed to respond: "+details);
diff --git a/moonlight-common b/moonlight-common
index 3cfdf4da..5872c0bf 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 3cfdf4dae21bfe38abd32107474f2619fea82078
+Subproject commit 5872c0bf3de27e8346258119abf341d5cd64d1d8