diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 2a7663f195..2e648af1bb 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2232,6 +2232,8 @@ int peer_delete(struct peer *peer)
 
 	SET_FLAG(peer->flags, PEER_FLAG_DELETE);
 
+	bgp_bfd_deregister_peer(peer);
+
 	/* If this peer belongs to peer group, clear up the
 	   relationship.  */
 	if (peer->group) {