diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
index 2f552533654df..45ca968c7e019 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
@@ -193,8 +193,8 @@ const time_grain_sqla: SharedControlConfig<'SelectControl'> = {
     // If a chart is a new one that isn't saved, metadata is null. In this
     // case we want to default P1D. If the chart has been saved, we want
     // to use whichever value was chosen, either nothing or valid a time grain.
-    return state.metadata || 'time_grain_sqla' in (state?.form_data ?? {})
-      ? state.form_data?.time_grain_sqla
+    return state?.metadata || 'time_grain_sqla' in (state?.form_data ?? {})
+      ? state?.form_data?.time_grain_sqla
       : 'P1D';
   },
   description: t(