diff --git a/R/endpoints.R b/R/endpoints.R
index 0146ca64..6949a136 100644
--- a/R/endpoints.R
+++ b/R/endpoints.R
@@ -1051,8 +1051,8 @@ pub_covidcast <- function(
           c("day", "week")
       ),
       create_epidata_field_info("geo_value", "text"),
-      create_epidata_field_info("time_value", "date"),
-      create_epidata_field_info("issue", "date"),
+      create_epidata_field_info("time_value", switch(time_type, day = "date", week = "epiweek")),
+      create_epidata_field_info("issue", switch(time_type, day = "date", week = "epiweek")),
       create_epidata_field_info("lag", "int"),
       create_epidata_field_info("value", "float"),
       create_epidata_field_info("stderr", "float"),