diff --git a/ringrtc/rffi/src/peer_connection.cc b/ringrtc/rffi/src/peer_connection.cc
index 4863e0c355..b972dd6bb3 100644
--- a/ringrtc/rffi/src/peer_connection.cc
+++ b/ringrtc/rffi/src/peer_connection.cc
@@ -414,6 +414,8 @@ Rust_sessionDescriptionFromV4(bool offer,
     // We'll set it around just in case.
     // But everything seems to work fine without it.
     stream->cname = "CNAMECNAMECNAME!";
+
+    stream->set_stream_ids({"s"});
   }
 
   audio->AddStream(audio_stream);
@@ -439,8 +441,7 @@ Rust_sessionDescriptionFromV4(bool offer,
   bundle.AddContentName(video_content_name);
   session->AddGroup(bundle);
 
-  // This is the default and used for "Plan B" SDP, which is what we use in V1, V2, and V3.
-  session->set_msid_signaling(cricket::kMsidSignalingSsrcAttribute);
+  session->set_msid_signaling(cricket::kMsidSignalingMediaSection);
 
   auto typ = offer ? SdpType::kOffer : SdpType::kAnswer;
   return new webrtc::JsepSessionDescription(typ, std::move(session), "1", "1");
diff --git a/ringrtc/rffi/src/peer_connection_factory.cc b/ringrtc/rffi/src/peer_connection_factory.cc
index 04a0d67ad9..5cced68fbb 100644
--- a/ringrtc/rffi/src/peer_connection_factory.cc
+++ b/ringrtc/rffi/src/peer_connection_factory.cc
@@ -384,7 +384,11 @@ RUSTEXPORT PeerConnectionInterface* Rust_createPeerConnection(
   config.audio_jitter_buffer_max_packets = audio_jitter_buffer_max_packets;
   config.set_audio_jitter_buffer_max_target_delay_ms(audio_jitter_buffer_max_target_delay_ms);
   config.set_audio_rtcp_report_interval_ms(audio_rtcp_report_interval_ms);
-  config.sdp_semantics = SdpSemantics::kPlanB_DEPRECATED;
+  if (kind == RffiPeerConnectionKind::kGroupCall) {
+    config.sdp_semantics = SdpSemantics::kPlanB_DEPRECATED;
+  } else {
+    config.sdp_semantics = SdpSemantics::kUnifiedPlan;
+  }
   if (ice_server.urls_size > 0) {
     webrtc::PeerConnectionInterface::IceServer rtc_ice_server;
     rtc_ice_server.username = std::string(ice_server.username_borrowed);
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration.mm b/sdk/objc/api/peerconnection/RTCConfiguration.mm
index 4a5a78fffa..6944a23564 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration.mm
+++ b/sdk/objc/api/peerconnection/RTCConfiguration.mm
@@ -69,8 +69,7 @@
 - (instancetype)init {
   // Copy defaults.
   webrtc::PeerConnectionInterface::RTCConfiguration config;
-  // RingRTC Change to use "Plan B"
-  config.sdp_semantics = webrtc::SdpSemantics::kPlanB_DEPRECATED;
+  config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan;
   return [self initWithNativeConfiguration:config];
 }