diff --git a/bfdd/bfdd_northbound.c b/bfdd/bfdd_northbound.c
index bbc39fc9c4..4b21a21162 100644
--- a/bfdd/bfdd_northbound.c
+++ b/bfdd/bfdd_northbound.c
@@ -546,6 +546,9 @@ bfdd_bfd_sessions_single_hop_stats_remote_discriminator_get_elem(
 {
 	const struct bfd_session *bs = list_entry;
 
+	if (bs->discrs.remote_discr == 0)
+		return NULL;
+
 	return yang_data_new_uint32(xpath, bs->discrs.remote_discr);
 }