diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f91f5ca665c0098a0533b64c6047aa159cd827de..d477a172b6996b6871722170b3481698b84661d8 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13404,7 +13404,7 @@ static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target
 			ast_log(LOG_DEBUG, "-- No target second channel ---\n");
 		ast_log(LOG_DEBUG, "-- END Sip transfer:--------------------\n");
 	}
-	if (transferer->chan2 && (ast_bridged_channel(transferer->chan2) == transferer->chan2->_bridge)) { /* We have a bridge on the transferer's channel */
+	if (transferer->chan2) { /* We have a bridge on the transferer's channel */
 		peera = transferer->chan1;	/* Transferer - PBX -> transferee channel * the one we hangup */
 		peerb = target->chan1;		/* Transferer - PBX -> target channel - This will get lost in masq */
 		peerc = transferer->chan2;	/* Asterisk to Transferee */
diff --git a/main/channel.c b/main/channel.c
index 0405a7ab5a532cfa4efdf4d8aa02761bb689bf58..2ab07b7e527281cf4323bd400b5375f7198e93ec 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3114,10 +3114,10 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo
 
 	/* each of these channels may be sitting behind a channel proxy (i.e. chan_agent)
 	   and if so, we don't really want to masquerade it, but its proxy */
-	if (original->_bridge && (original->_bridge != ast_bridged_channel(original)))
+	if (original->_bridge && (original->_bridge != ast_bridged_channel(original)) && (original->_bridge->_bridge != original))
 		final_orig = original->_bridge;
 
-	if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone)))
+	if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone)) && (clone->_bridge->_bridge != clone))
 		final_clone = clone->_bridge;
 
 	if ((final_orig != original) || (final_clone != clone)) {