diff --git a/bgpd/bgp_linkstate_tlv.c b/bgpd/bgp_linkstate_tlv.c
index 11aeb1cf41b8..de7f8479bb37 100644
--- a/bgpd/bgp_linkstate_tlv.c
+++ b/bgpd/bgp_linkstate_tlv.c
@@ -1528,6 +1528,11 @@ static void bgp_linkstate_tlv_isis_area_indentifier_display(struct vty *vty,
 {
 	struct iso_address addr;
 
+	if (length > sizeof(addr.area_addr)) {
+		bgp_linkstate_tlv_hexa_display(vty, pnt, length, json);
+		return;
+	}
+
 	addr.addr_len = length;
 	memcpy(addr.area_addr, pnt, length);