diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index d56fdd75ce..191b1641b2 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -406,7 +406,6 @@ static int bgp_accept(struct thread *thread)
 
 	peer = peer_create(&su, peer1->conf_if, peer1->bgp, peer1->local_as,
 			   peer1->as, peer1->as_type, 0, 0, NULL);
-	peer->su = su;
 	hash_release(peer->bgp->peerhash, peer);
 	hash_get(peer->bgp->peerhash, peer, hash_alloc_intern);
 
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 58f23fd2f4..f617c9f997 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -2835,7 +2835,7 @@ static int peer_conf_interface_get(struct vty *vty, const char *conf_if,
 	peer = peer_lookup_by_conf_if(bgp, conf_if);
 	if (peer) {
 		if (as_str)
-			ret = peer_remote_as(bgp, &su, conf_if, &as, as_type,
+			ret = peer_remote_as(bgp, NULL, conf_if, &as, as_type,
 					     afi, safi);
 	} else {
 		if (bgp_flag_check(bgp, BGP_FLAG_NO_DEFAULT_IPV4)
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 0300485e91..ebaa0a3e5f 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1439,6 +1439,8 @@ struct peer *peer_create(union sockunion *su, const char *conf_if,
 		if (peer->host)
 			XFREE(MTYPE_BGP_PEER_HOST, peer->host);
 		peer->host = XSTRDUP(MTYPE_BGP_PEER_HOST, conf_if);
+		if (su)
+			peer->su = *su;
 	} else if (su) {
 		peer->su = *su;
 		sockunion2str(su, buf, SU_ADDRSTRLEN);