diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 1c3b4e05c6..ce9666d611 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -6317,9 +6317,11 @@ struct bgpevpn *bgp_evpn_new(struct bgp *bgp, vni_t vni,
 void bgp_evpn_free(struct bgp *bgp, struct bgpevpn *vpn)
 {
 	struct bgp_dest *dest = NULL;
+	uint32_t ann_count = zebra_announce_count(&bm->zebra_announce_head);
 
-	while (zebra_announce_count(&bm->zebra_announce_head)) {
+	while (ann_count) {
 		dest = zebra_announce_pop(&bm->zebra_announce_head);
+		ann_count--;
 		if (dest->za_vpn == vpn) {
 			bgp_path_info_unlock(dest->za_bgp_pi);
 			bgp_dest_unlock_node(dest);
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 80383dacdf..09e64cf9ec 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3908,11 +3908,13 @@ int bgp_delete(struct bgp *bgp)
 	int i;
 	struct bgp_dest *dest = NULL;
 	struct graceful_restart_info *gr_info;
+	uint32_t ann_count = zebra_announce_count(&bm->zebra_announce_head);
 
 	assert(bgp);
 
-	while (zebra_announce_count(&bm->zebra_announce_head)) {
+	while (ann_count) {
 		dest = zebra_announce_pop(&bm->zebra_announce_head);
+		ann_count--;
 		if (dest->za_bgp_pi->peer->bgp == bgp) {
 			bgp_path_info_unlock(dest->za_bgp_pi);
 			bgp_dest_unlock_node(dest);