diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index 0280cde238..1ae2ba92b0 100644
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -172,6 +172,13 @@ void redistribute_update(const struct prefix *p, const struct prefix *src_p,
 			  __FUNCTION__);
 		return;
 	}
+	if (!zebra_check_addr(p)) {
+		if (IS_ZEBRA_DEBUG_RIB)
+			zlog_debug("Redist update filter prefix %s",
+				   prefix2str(p, buf, sizeof(buf)));
+		return;
+	}
+
 
 	for (ALL_LIST_ELEMENTS(zrouter.client_list, node, nnode, client)) {
 		send_redistribute = 0;
@@ -246,6 +253,13 @@ void redistribute_delete(const struct prefix *p, const struct prefix *src_p,
 		return;
 	}
 
+	if (!zebra_check_addr(p)) {
+		if (IS_ZEBRA_DEBUG_RIB)
+			zlog_debug("Redist delete filter prefix %s",
+				   prefix2str(p, buf, sizeof(buf)));
+		return;
+	}
+
 	for (ALL_LIST_ELEMENTS(zrouter.client_list, node, nnode, client)) {
 		if ((is_default_prefix(p)
 		     && vrf_bitmap_check(client->redist_default[afi],