diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index 21864cf1a6..dcc707452a 100644
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -320,8 +320,10 @@ static void bgp_peer_remove_bfd(struct peer *p)
 		return;
 	}
 
-	if (p->bfd_config)
-		bfd_sess_free(&p->bfd_config->session);
+	if (p->bfd_config) {
+			bfd_sess_free(&p->bfd_config->session);
+			p->bfd_config->manual = false;
+	}
 
 	XFREE(MTYPE_BFD_CONFIG, p->bfd_config);
 }