diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.ts b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.ts
index a25a4839c0f..3fccd7f4ace 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.ts
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.ts
@@ -30,8 +30,8 @@ const CUSTOM_OPERATIONS = [...CUSTOM_OPERATORS].map(
 
 interface AdhocFilterInput {
   expressionType?: string;
-  subject?: string;
-  operator?: string;
+  subject?: string | null;
+  operator?: string | null;
   operatorId?: string;
   comparator?: unknown;
   clause?: string;
@@ -42,6 +42,8 @@ interface AdhocFilterInput {
   deck_slices?: unknown;
   layerFilterScope?: unknown;
   filterOptionName?: string;
+  // Allow additional properties for flexibility
+  [key: string]: unknown;
 }
 
 export default class AdhocFilter {
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetric.ts b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetric.ts
index 9df97dab64c..9b073428a8f 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetric.ts
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetric.ts
@@ -40,6 +40,12 @@ interface AdhocMetricInput {
   hasCustomLabel?: boolean;
   label?: string;
   optionName?: string;
+  // Additional properties that may be passed in
+  metric_name?: string;
+  expression?: string;
+  error_text?: string;
+  uuid?: string;
+  [key: string]: unknown;
 }
 
 function inferSqlExpressionColumn(adhocMetric: AdhocMetricInput): string | null {