diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index f6f2f5f6e4..4995f9a1fd 100644
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -326,7 +326,9 @@ static void bgp_peer_remove_bfd(struct peer *p)
 		return;
 	}
 
-	bfd_sess_free(&p->bfd_config->session);
+	if (p->bfd_config)
+		bfd_sess_free(&p->bfd_config->session);
+
 	XFREE(MTYPE_BFD_CONFIG, p->bfd_config);
 }