diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index d55467c727..8285392527 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -358,8 +358,6 @@ static void nexthop_set_resolved(afi_t afi, const struct nexthop *newhop,
 		if (newhop->ifindex) {
 			resolved_hop->type = NEXTHOP_TYPE_IPV4_IFINDEX;
 			resolved_hop->ifindex = newhop->ifindex;
-			if (newhop->flags & NEXTHOP_FLAG_ONLINK)
-				resolved_hop->flags |= NEXTHOP_FLAG_ONLINK;
 		}
 		break;
 	case NEXTHOP_TYPE_IPV6:
@@ -398,6 +396,9 @@ static void nexthop_set_resolved(afi_t afi, const struct nexthop *newhop,
 		break;
 	}
 
+	if (newhop->flags & NEXTHOP_FLAG_ONLINK)
+		resolved_hop->flags |= NEXTHOP_FLAG_ONLINK;
+
 	/* Copy labels of the resolved route */
 	if (newhop->nh_label)
 		nexthop_add_labels(resolved_hop, newhop->nh_label_type,