diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py
index 77f902dcb..c6c93a7b1 100644
--- a/api/chalicelib/core/custom_metrics.py
+++ b/api/chalicelib/core/custom_metrics.py
@@ -9,7 +9,7 @@ from chalicelib.utils.TimeUTC import TimeUTC
 PIE_CHART_GROUP = 5
 
 
-def __try_live(project_id, data: schemas.CreateCustomMetricsSchema):
+def __try_live(project_id, data: schemas.TryCustomMetricsPayloadSchema):
     results = []
     for i, s in enumerate(data.series):
         s.filter.startDate = data.startDate
@@ -42,7 +42,7 @@ def __try_live(project_id, data: schemas.CreateCustomMetricsSchema):
     return results
 
 
-def merged_live(project_id, data: schemas.CreateCustomMetricsSchema):
+def merged_live(project_id, data: schemas.TryCustomMetricsPayloadSchema):
     series_charts = __try_live(project_id=project_id, data=data)
     if data.view_type == schemas.MetricTimeseriesViewType.progress or data.metric_type == schemas.MetricType.table:
         return series_charts
diff --git a/api/chalicelib/core/dashboards2.py b/api/chalicelib/core/dashboards2.py
index ac382f3d7..d6c05f057 100644
--- a/api/chalicelib/core/dashboards2.py
+++ b/api/chalicelib/core/dashboards2.py
@@ -215,7 +215,7 @@ def pin_dashboard(project_id, user_id, dashboard_id):
 def create_metric_add_widget(project_id, user_id, dashboard_id, data: schemas.CreateCustomMetricsSchema):
     metric_id = custom_metrics.create(project_id=project_id, user_id=user_id, data=data, dashboard=True)
     return add_widget(project_id=project_id, user_id=user_id, dashboard_id=dashboard_id,
-                      data=schemas.AddWidgetToDashboardPayloadSchema(metric_id=metric_id))
+                      data=schemas.AddWidgetToDashboardPayloadSchema(metricId=metric_id))
 
 
 PREDEFINED = {schemas.TemplateKeys.count_sessions: dashboard.get_processed_sessions,
diff --git a/api/schemas.py b/api/schemas.py
index 158850618..6e54af018 100644
--- a/api/schemas.py
+++ b/api/schemas.py
@@ -906,7 +906,7 @@ class UpdateWidgetPayloadSchema(BaseModel):
 
 
 class AddWidgetToDashboardPayloadSchema(UpdateWidgetPayloadSchema):
-    metric_id: int = Field(default=None)
+    metric_id: int = Field(...)
 
     class Config:
         alias_generator = attribute_to_camel_case