diff --git a/modules/data.land/inst/generate_events.R b/modules/data.land/inst/generate_events.R
index f44f148821..f1da4176de 100755
--- a/modules/data.land/inst/generate_events.R
+++ b/modules/data.land/inst/generate_events.R
@@ -49,9 +49,8 @@ if (DESIGN_POINTS) {
 }
 
 ca_fields <- ca_field_attributes |>
-  dplyr::select(site_id, pft, crop) |>
-  dplyr::distinct() |>
-  tidyr::crossing(year = 2016:2024) |>
+  dplyr::select(site_id, year, pft, crop) |>
+  dplyr::filter(year >= 2016 & year <= 2024) |>
   dplyr::group_by(site_id) |>
   dplyr::mutate(first_year = min(year)) |>
   dplyr::ungroup()