diff --git a/lib/zclient.c b/lib/zclient.c
index 5ca5849948..a1e7194890 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -4487,11 +4487,9 @@ static int zclient_neigh_ip_read_entry(struct stream *s, struct ipaddr *add)
 	return -1;
 }
 
-int zclient_neigh_ip_encode(struct stream *s,
-			    uint16_t cmd,
-			    union sockunion *in,
-			    union sockunion *out,
-			    struct interface *ifp)
+int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
+			    union sockunion *out, struct interface *ifp,
+			    int ndm_state)
 {
 	int ret = 0;
 
@@ -4506,7 +4504,7 @@ int zclient_neigh_ip_encode(struct stream *s,
 		stream_putc(s, AF_UNSPEC);
 	stream_putl(s, ifp->ifindex);
 	if (out)
-		stream_putl(s, ZEBRA_NEIGH_STATE_REACHABLE);
+		stream_putl(s, ndm_state);
 	else
 		stream_putl(s, ZEBRA_NEIGH_STATE_FAILED);
 	return ret;
diff --git a/lib/zclient.h b/lib/zclient.h
index a25c5800b7..d24f06b778 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -867,11 +867,9 @@ struct zapi_neigh_ip {
 	uint32_t ndm_state;
 };
 int zclient_neigh_ip_decode(struct stream *s, struct zapi_neigh_ip *api);
-int zclient_neigh_ip_encode(struct stream *s,
-			    uint16_t cmd,
-			    union sockunion *in,
-			    union sockunion *out,
-			    struct interface *ifp);
+int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
+			    union sockunion *out, struct interface *ifp,
+			    int ndm_state);
 
 /*
  * We reserve the top 4 bits for l2-NHG, everything else
diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
index ee8db277d9..12a2fc2fa0 100644
--- a/nhrpd/nhrp_route.c
+++ b/nhrpd/nhrp_route.c
@@ -452,7 +452,8 @@ void nhrp_send_zebra_nbr(union sockunion *in,
 	stream_reset(s);
 	zclient_neigh_ip_encode(s, out ? ZEBRA_NEIGH_IP_ADD :
 				ZEBRA_NEIGH_IP_DEL, in, out,
-				ifp);
+				ifp, out ? ZEBRA_NEIGH_STATE_REACHABLE
+				: ZEBRA_NEIGH_STATE_FAILED);
 	stream_putw_at(s, 0, stream_get_endp(s));
 	zclient_send_message(zclient);
 }
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index ddd6a74c0b..6666b3525e 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -997,7 +997,8 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
 			continue;
 
 		s = stream_new(ZEBRA_MAX_PACKET_SIZ);
-		zclient_neigh_ip_encode(s, cmd, &ip, link_layer_ipv4, ifp);
+		zclient_neigh_ip_encode(s, cmd, &ip, link_layer_ipv4, ifp,
+					ndm_state);
 		stream_putw_at(s, 0, stream_get_endp(s));
 		zserv_send_message(client, s);
 	}