diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
index 6989094144f..89f6edba1b8 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -359,7 +359,7 @@ const show_empty_columns: SharedControlConfig<'CheckboxControl'> = {
 
 const datetime_columns_lookup: SharedControlConfig<'HiddenControl'> = {
   type: 'HiddenControl',
-  initialValue: (control: ControlState, state: ControlPanelState) =>
+  initialValue: (control: ControlState, state: ControlPanelState | null) =>
     Object.fromEntries(
       ensureIsArray<Record<string, any>>(state?.datasource?.columns)
         .filter(option => option.is_dttm)
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx
index 4963be01226..2939bb2b438 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx
@@ -39,7 +39,7 @@ export const xAxisMixin = {
   description: (state: ControlPanelState) =>
     getAxisLabel(state?.form_data).description,
   validators: [validateNonEmpty],
-  initialValue: (control: ControlState, state: ControlPanelState) => {
+  initialValue: (control: ControlState, state: ControlPanelState | null) => {
     if (
       isFeatureEnabled(FeatureFlag.GENERIC_CHART_AXES) &&
       state?.form_data?.granularity_sqla &&
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
index b439a9888a3..fa9307ee042 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
@@ -172,10 +172,14 @@ const config: ControlPanelConfig = {
       label: t('Distribute across'),
       multi: true,
       description: t('Columns to calculate distribution across.'),
-      initialValue: (control: ControlState, state: ControlPanelState) => {
+      initialValue: (
+        control: ControlState,
+        state: ControlPanelState | null,
+      ) => {
         if (
-          (state && !control?.value) ||
-          (Array.isArray(control?.value) && control.value.length === 0)
+          state &&
+          (!control?.value ||
+            (Array.isArray(control?.value) && control.value.length === 0))
         ) {
           return [getTemporalColumns(state.datasource).defaultTemporalColumn];
         }