diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 58ef94a53e..ddbc8905ac 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -10714,7 +10714,8 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 
 			switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 1 %s %u %s %d typ host generation 0\r\n",
 							tmp1, ice_out->cands[0][0].transport, c1,
-							ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port
+							//ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port
+							a_engine->local_sdp_ip, a_engine->local_sdp_port
 							);
 
 			if (include_external && !zstr(smh->mparams->extsipip)) {
@@ -10725,8 +10726,8 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 			}
 
 			if (!zstr(a_engine->local_sdp_ip) && !zstr(ice_out->cands[0][0].con_addr) && 
-				strcmp(a_engine->local_sdp_ip, ice_out->cands[0][0].con_addr)
-				&& a_engine->local_sdp_port != ice_out->cands[0][0].con_port) {
+				(strcmp(a_engine->local_sdp_ip, ice_out->cands[0][0].con_addr)
+				|| a_engine->local_sdp_port != ice_out->cands[0][0].con_port)) {
 
 				switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 1 %s %u %s %d typ srflx raddr %s rport %d generation 0\r\n",
 								tmp2, ice_out->cands[0][0].transport, c3,