diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c
index 7e48ab92f21ee57275be599412058d5c3252b7ca..aa5299c24190926c44269c3536ec202502def8cf 100644
--- a/bridges/bridge_native_rtp.c
+++ b/bridges/bridge_native_rtp.c
@@ -230,8 +230,10 @@ static void native_rtp_bridge_stop(struct ast_bridge *bridge, struct ast_channel
 		break;
 	case AST_RTP_GLUE_RESULT_REMOTE:
 		if (!target) {
-			glue0->update_peer(c0->chan, NULL, NULL, NULL, NULL, 0);
-			if (glue1) {
+			if (ast_channel_is_leaving_bridge(c0->chan)) {
+				glue0->update_peer(c0->chan, NULL, NULL, NULL, NULL, 0);
+			}
+			if (glue1 && ast_channel_is_leaving_bridge(c1->chan)) {
 				glue1->update_peer(c1->chan, NULL, NULL, NULL, NULL, 0);
 			}
 		} else {
@@ -485,8 +487,9 @@ static void native_rtp_bridge_leave(struct ast_bridge *bridge, struct ast_bridge
 	}
 
 	/* Direct RTP may have occurred, tear it down */
-	glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
-
+	if (ast_channel_is_leaving_bridge(bridge_channel->chan)) {
+		glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
+	}
 	native_rtp_bridge_stop(bridge, NULL);
 }
 
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index a4ad2ae01519cb3d4fcc6805992d015347649053..c2d8b39c9aed2f2fd3d66c1452ea767224843645 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -4272,6 +4272,22 @@ struct ast_bridge *ast_channel_get_bridge(const struct ast_channel *chan);
  */
 int ast_channel_is_bridged(const struct ast_channel *chan);
 
+/*!
+ * \brief Determine if a channel is leaving a bridge, but \em not hung up
+ * \since 12.3.0
+ *
+ * \param chan The channel to test
+ *
+ * \note If a channel is hung up, it is implicitly leaving any bridge it
+ * may be in. This function is used to test if a channel is leaving a bridge
+ * but may survive the experience, if it has a place to go to (dialplan or
+ * otherwise)
+ *
+ * \retval 0 The channel is not leaving the bridge or is hung up
+ * \retval non-zero The channel is leaving the bridge
+ */
+int ast_channel_is_leaving_bridge(struct ast_channel *chan);
+
 /*!
  * \brief Get the channel's bridge peer only if the bridge is two-party.
  * \since 12.0.0
diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index 2b37f25b5b18e4692e29f4151624831a2acd53b6..9d62af78b0edbbd5cf28624d1b6dcb7dccefb322 100644
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -1756,9 +1756,9 @@ void bridge_channel_internal_pull(struct ast_bridge_channel *bridge_channel)
 	/* If we are not going to be hung up after leaving a bridge, and we were an
 	 * outgoing channel, clear the outgoing flag.
 	 */
-	if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING)
-			&& (ast_channel_softhangup_internal_flag(bridge_channel->chan) & (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE)
-			    || bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT)) {
+	if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING) &&
+	    (ast_channel_is_leaving_bridge(bridge_channel->chan) ||
+	     bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT)) {
 		ast_debug(2, "Channel %s will survive this bridge; clearing outgoing (dialed) flag\n", ast_channel_name(bridge_channel->chan));
 		ast_clear_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING);
 	}
diff --git a/main/channel.c b/main/channel.c
index 2d84c771d2d2fdffcaecc64303d562d45e426d36..a65da85cb4b827bb10b663534c934cd7ce3830b5 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -10146,6 +10146,18 @@ int ast_channel_is_bridged(const struct ast_channel *chan)
 	return ast_channel_internal_bridge(chan) != NULL;
 }
 
+int ast_channel_is_leaving_bridge(struct ast_channel *chan)
+{
+	int flags = ast_channel_softhangup_internal_flag(chan);
+
+	/* We test the flags independently here in case they are masked with
+	 * actual "hangup" soft-hangup flags
+	 */
+	return (flags == AST_SOFTHANGUP_ASYNCGOTO ||
+	        flags == AST_SOFTHANGUP_UNBRIDGE ||
+	        flags == (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE));
+}
+
 struct ast_channel *ast_channel_bridge_peer(struct ast_channel *chan)
 {
 	struct ast_channel *peer;
diff --git a/main/framehook.c b/main/framehook.c
index de8c612aaf1f2126c73c674ffce2613b673e1497..84719ef491c1b5d508814bc3207d636fbab87205 100644
--- a/main/framehook.c
+++ b/main/framehook.c
@@ -189,6 +189,10 @@ int ast_framehook_detach(struct ast_channel *chan, int id)
 	}
 	AST_LIST_TRAVERSE_SAFE_END;
 
+	if (ast_channel_is_bridged(chan)) {
+		ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE);
+	}
+
 	return res;
 }
 
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 6acbc0c6d366d117c8da5f20b7653064aba6e1bd..192ce2cc700551982d24f8b6432a353f41aa6358 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -780,6 +780,9 @@ int ast_sip_session_refresh(struct ast_sip_session *session,
 			return -1;
 		}
 	}
+	ast_debug(3, "Sending session refresh SDP via %s to %s\n",
+		method == AST_SIP_SESSION_REFRESH_METHOD_INVITE ? "re-INVITE" : "UPDATE",
+		ast_sorcery_object_get_id(session->endpoint));
 	ast_sip_session_send_request_with_cb(session, tdata, on_response);
 	return 0;
 }