diff --git a/api/candidate.cc b/api/candidate.cc
index 4d17256c2e..a14dda350c 100644
--- a/api/candidate.cc
+++ b/api/candidate.cc
@@ -22,6 +22,7 @@ Candidate::Candidate()
       component_(0),
       priority_(0),
       network_type_(rtc::ADAPTER_TYPE_UNKNOWN),
+      underlying_type_for_vpn_(rtc::ADAPTER_TYPE_UNKNOWN),
       generation_(0),
       network_id_(0),
       network_cost_(0) {}
@@ -46,6 +47,7 @@ Candidate::Candidate(int component,
       password_(password),
       type_(type),
       network_type_(rtc::ADAPTER_TYPE_UNKNOWN),
+      underlying_type_for_vpn_(rtc::ADAPTER_TYPE_UNKNOWN),
       generation_(generation),
       foundation_(foundation),
       network_id_(network_id),
diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index ed6cd99913..82e5942e6a 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -2605,8 +2605,19 @@ void PeerConnection::AddRemoteCandidate(const std::string& mid,
                                         const cricket::Candidate& candidate) {
   RTC_DCHECK_RUN_ON(signaling_thread());
 
+  if (candidate.network_type() != rtc::ADAPTER_TYPE_UNKNOWN) {
+    RTC_DLOG(LS_WARNING) << "Using candidate with adapter type set - this "
+                            "should only happen in test";
+  }
+
+  // Clear fields that do not make sense as remote candidates.
+  cricket::Candidate new_candidate(candidate);
+  new_candidate.set_network_type(rtc::ADAPTER_TYPE_UNKNOWN);
+  new_candidate.set_relay_protocol("");
+  new_candidate.set_underlying_type_for_vpn(rtc::ADAPTER_TYPE_UNKNOWN);
+
   network_thread()->PostTask(SafeTask(
-      network_thread_safety_, [this, mid = mid, candidate = candidate] {
+      network_thread_safety_, [this, mid = mid, candidate = new_candidate] {
         RTC_DCHECK_RUN_ON(network_thread());
         std::vector<cricket::Candidate> candidates = {candidate};
         RTCError error =
diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index cc5c7208e3..014ffa43dd 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc
@@ -934,6 +934,9 @@ const std::string& ProduceIceCandidateStats(int64_t timestamp_us,
     } else {
       // We don't expect to know the adapter type of remote candidates.
       RTC_DCHECK_EQ(rtc::ADAPTER_TYPE_UNKNOWN, candidate.network_type());
+      RTC_DCHECK_EQ(0, candidate.relay_protocol().compare(""));
+      RTC_DCHECK_EQ(rtc::ADAPTER_TYPE_UNKNOWN,
+                    candidate.underlying_type_for_vpn());
     }
     candidate_stats->ip = candidate.address().ipaddr().ToString();
     candidate_stats->address = candidate.address().ipaddr().ToString();