diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index f17bc7b8c0..23b893c1c8 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -747,6 +747,12 @@ static int bgp_capability_hostname(struct peer *peer,
 
 	if (len) {
 		str[len] = '\0';
+
+		if (peer->domainname != NULL) {
+			XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
+			peer->domainname = NULL;
+		}
+
 		peer->domainname = XSTRDUP(MTYPE_BGP_PEER_HOST, str);
 	}