diff --git a/app/backend/computermanager.cpp b/app/backend/computermanager.cpp
index 6cf0bd4c..49096236 100644
--- a/app/backend/computermanager.cpp
+++ b/app/backend/computermanager.cpp
@@ -767,9 +767,9 @@ private:
                 // Drop the lock before notifying
                 lock.unlock();
 
-                // If this wasn't added via mDNS but it is a RFC 1918 IPv4 address,
+                // If this wasn't added via mDNS but it is a RFC 1918 IPv4 address and not a VPN,
                 // go ahead and do the STUN request now to populate an external address.
-                if (!m_Mdns && addressIsSiteLocalV4) {
+                if (!m_Mdns && addressIsSiteLocalV4 && !newComputer->isReachableOverVpn()) {
                     quint32 addr;
                     int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &addr);
                     if (err == 0) {