diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index cb0d8c5c92..5f0f2a5933 100644
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -737,7 +737,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 	pnc->last_update = pim_time_monotonic_usec();
 
 	if (nhr.nexthop_num) {
-		pnc->nexthop_num = 0; // Only increment for pim enabled rpf.
+		pnc->nexthop_num = 0;
 
 		for (i = 0; i < nhr.nexthop_num; i++) {
 			nexthop = nexthop_from_zapi_nexthop(&nhr.nexthops[i]);
@@ -855,7 +855,8 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 				nhlist_tail = nexthop;
 				nhlist_head = nexthop;
 			}
-			// Only keep track of nexthops which are PIM enabled.
+
+			// Keep track of all nexthops, even PIM-disabled ones.
 			pnc->nexthop_num++;
 		}
 		/* Reset existing pnc->nexthop before assigning new list */