diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c
index a6cff2a110..6273d33b9a 100644
--- a/bgpd/bgp_nb_config.c
+++ b/bgpd/bgp_nb_config.c
@@ -6255,10 +6255,11 @@ int bgp_neighbors_unnumbered_neighbor_afi_safis_afi_safi_enabled_destroy(
 static struct peer *bgp_peer_group_peer_lookup(struct bgp *bgp,
 					       const char *peer_str)
 {
+	struct peer *peer = NULL;
 	struct peer_group *group = NULL;
 
 	group = peer_group_lookup(bgp, peer_str);
-	return group->conf;
+	return peer = group->conf;
 }
 
 /*