diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 6666b3525e..72c7071502 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2221,8 +2221,8 @@ stream_failure:
 static void zread_router_id_add(ZAPI_HANDLER_ARGS)
 {
 	afi_t afi;
-
 	struct prefix p;
+	struct prefix zero;
 
 	STREAM_GETW(msg, afi);
 
@@ -2238,6 +2238,18 @@ static void zread_router_id_add(ZAPI_HANDLER_ARGS)
 
 	router_id_get(afi, &p, zvrf);
 
+	/*
+	 * If we have not officially setup a router-id let's not
+	 * tell the upper level protocol about it yet.
+	 */
+	memset(&zero, 0, sizeof(zero));
+	if ((p.family == AF_INET && p.u.prefix4.s_addr == INADDR_ANY)
+	    || (p.family == AF_INET6
+		&& memcmp(&p.u.prefix6, &zero.u.prefix6,
+			  sizeof(struct in6_addr))
+			   == 0))
+		return;
+
 	zsend_router_id_update(client, afi, &p, zvrf_id(zvrf));
 
 stream_failure: