diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index 89f46f9c97..26f6d404e9 100644
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -153,10 +153,16 @@ static bool zebra_redistribute_check(const struct route_entry *re,
 				     struct zserv *client,
 				     const struct prefix *p, int afi)
 {
+	struct zebra_vrf *zvrf;
+
 	/* Process only if there is valid re */
 	if (!re)
 		return false;
 
+	zvrf = vrf_info_lookup(re->vrf_id);
+	if (re->vrf_id == VRF_DEFAULT && zvrf->table_id != re->table)
+		return false;
+
 	/* If default route and redistributed */
 	if (is_default_prefix(p)
 	    && vrf_bitmap_check(client->redist_default[afi], re->vrf_id))