diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c
index 0918b8b..820c63a 100644
--- a/src/libosmo-mgcp/mgcp_conn.c
+++ b/src/libosmo-mgcp/mgcp_conn.c
@@ -190,17 +190,25 @@
 {
 	struct mgcp_conn *conn;
 	const char *id_upper;
+	const char *conn_id;
 
 	if (!id || !*id)
 		return NULL;
 
+	/* Ignore leading zeros in needle */
+	while (*id == '0')
+		id++;
+
 	/* Use uppercase to compare identifiers, to avoid mismatches: RFC3435 2.1.3.2 "Names of
 	 * Connections" defines the id as a hex string, so clients may return lower case hex even though
 	 * we sent upper case hex in the CRCX response. */
 	id_upper = osmo_str_toupper(id);
 
 	llist_for_each_entry(conn, &endp->conns, entry) {
-		if (strcmp(conn->id, id_upper) == 0)
+		/* Ignore leading zeros in haystack */
+		for (conn_id=conn->id; *conn_id == '0'; conn_id++);
+
+		if (strcmp(conn_id, id_upper) == 0)
 			return conn;
 	}
 
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 99ddd71..b9f7253 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1759,8 +1759,14 @@
 	int i;
 	const char *conn_id_generated = "000023AB";
 	const char *conn_id_request[] = {
+		"23AB",
+		"0023AB",
 		"000023AB",
+		"00000023AB",
+		"23ab",
+		"0023ab",
 		"000023ab",
+		"00000023ab",
 	};
 
 	printf("\nTesting %s\n", __func__);
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index f50f487..28e9aad 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
Binary files differ