diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 242f907..de0bc38 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -504,7 +504,6 @@
 	 *  overlapping RTP SSRC traveling to the BTSes behind the BSC,
 	 *  similarly, for flows traveling to the MSC.
 	 */
-	struct in6_addr addr_unset = {};
 	static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1);
 	uint16_t osmux_dummy = endp->trunk->cfg->osmux_dummy;
 
@@ -517,10 +516,7 @@
 	}
 
 	/* Wait until we have the connection information from MDCX */
-	if (memcmp(&conn->end.addr, &addr_unset,
-		   conn->end.addr.u.sa.sa_family == AF_INET6 ?
-			sizeof(struct in6_addr) :
-			sizeof(struct in_addr)) == 0) {
+	if (!mgcp_rtp_end_remote_addr_available(&conn->end)) {
 		LOGPCONN(conn->conn, DOSMUX, LOGL_INFO,
 			"Osmux remote address/port still unknown\n");
 		return -1;
@@ -622,7 +618,6 @@
 	char ipbuf[INET6_ADDRSTRLEN];
 	struct osmux_hdr *osmuxh;
 	int buf_len;
-	struct in_addr addr_unset = {};
 
 	/*! The dummy packet will not be sent via the actual OSMUX connection,
 	 *  instead it is sent out of band to port where the remote OSMUX
@@ -634,7 +629,7 @@
 	 *  approach is simple though. */
 
 	/* Wait until we have the connection information from MDCX */
-	if (memcmp(&conn->end.addr, &addr_unset, sizeof(addr_unset)) == 0)
+	if (!mgcp_rtp_end_remote_addr_available(&conn->end))
 		return 0;
 
 	if (endp_osmux_state_check(endp, conn, true) < 0)