diff --git a/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp b/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp
index 42b69d8fac5f..27d45977477d 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp
@@ -703,7 +703,11 @@ void MediaTransportHandlerSTS::AddIceCandidate(
         nsresult rv = stream->ParseTrickleCandidate(aCandidate, aUfrag,
                                                     aObfuscatedAddress);
         if (NS_SUCCEEDED(rv)) {
-          if (mObfuscateHostAddresses && tokens.size() > 4) {
+          // If the address is not obfuscated, we want to track it as
+          // explicitly signaled so that we know it is fine to reveal
+          // the address later on.
+          if (mObfuscateHostAddresses && tokens.size() > 4 &&
+              aObfuscatedAddress.empty()) {
             mSignaledAddresses.insert(tokens[4]);
           }
         } else {