diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index cfa63a2924..1cdda1b134 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1323,7 +1323,7 @@ DEFUN_YANG_NOSH(router_bgp,
 		UNSET_FLAG(bgp->vrf_flags, BGP_VRF_AUTO);
 
 		snprintf(base_xpath, sizeof(base_xpath), FRR_BGP_GLOBAL_XPATH,
-			 "frr-bgp:bgp", "bgp", VRF_DEFAULT_NAME);
+			 "frr-bgp:bgp", "bgp", name ? name : VRF_DEFAULT_NAME);
 
 		nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL);
 		snprintf(as_str, 12, "%d", bgp->as);