diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c
index 0455d1b..17c4bbf 100644
--- a/openbsc/src/nat/bsc_mgcp_utils.c
+++ b/openbsc/src/nat/bsc_mgcp_utils.c
@@ -314,6 +314,13 @@
 	}
 
 	endp->ci = bsc_mgcp_extract_ci((const char *) msg->l2h);
+	if (endp->ci == CI_UNUSED) {
+		LOGP(DMGCP, LOGL_ERROR, "No CI, freeing endpoint 0x%x\n",
+			ENDPOINT_NUMBER(endp));
+		bsc_mgcp_free_endpoint(bsc->nat, ENDPOINT_NUMBER(endp));
+		mgcp_free_endp(endp);
+		return;
+	}
 
 	/* free some stuff */
 	talloc_free(bsc_endp->transaction_id);