diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c
index 95426683a8..000beba870 100644
--- a/zebra/zebra_vrf.c
+++ b/zebra/zebra_vrf.c
@@ -476,7 +476,13 @@ static int vrf_config_write(struct vty *vty)
 		if (!zvrf)
 			continue;
 
-		if (vrf->vrf_id != VRF_DEFAULT)
+		if (zvrf_id(zvrf) == VRF_DEFAULT) {
+			if (zvrf->l3vni)
+				vty_out(vty, "vni %u\n", zvrf->l3vni);
+			vty_out(vty, "!\n");
+		}
+
+		if (strcmp(zvrf_name(zvrf), VRF_DEFAULT_NAME)) {
 			vty_out(vty, "vrf %s\n", zvrf_name(zvrf));
 
 		static_config(vty, zvrf, AFI_IP, SAFI_UNICAST, "ip route");