diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 90881621b331..1bc1a47c69a0 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -3730,6 +3730,9 @@ void vpn_leak_postchange_all(void)
 		if (bgp->inst_type != BGP_INSTANCE_TYPE_VRF)
 			continue;
 
+		if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO))
+			continue;
+
 		vpn_leak_postchange(
 			BGP_VPN_POLICY_DIR_TOVPN,
 			AFI_IP,
@@ -3749,6 +3752,9 @@ void vpn_leak_postchange_all(void)
 		if (bgp->inst_type != BGP_INSTANCE_TYPE_VRF)
 			continue;
 
+		if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO))
+			continue;
+
 		vpn_leak_postchange(
 			BGP_VPN_POLICY_DIR_FROMVPN,
 			AFI_IP,
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 38c335f75a3f..1a87799ad284 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1703,7 +1703,7 @@ DEFUN (no_router_bgp,
 					continue;
 
 				if (CHECK_FLAG(tmp_bgp->vrf_flags, BGP_VRF_AUTO))
-					continue;
+					bgp_delete(tmp_bgp);
 
 				if (CHECK_FLAG(
 					    tmp_bgp->af_flags[AFI_IP]