diff --git a/src/components/Executions/ExecutionFilters.tsx b/src/components/Executions/ExecutionFilters.tsx
index caf1e4d48..76cedd177 100644
--- a/src/components/Executions/ExecutionFilters.tsx
+++ b/src/components/Executions/ExecutionFilters.tsx
@@ -60,16 +60,16 @@ const RenderFilter: React.FC<{ filter: FilterState }> = ({ filter }) => {
  */
 export const ExecutionFilters: React.FC<{
     filters: (FilterState | BooleanFilterState)[];
-    chartIds: string[];
-    clearCharts: () => void;
+    chartIds?: string[];
+    clearCharts?: () => void;
 }> = ({ filters, chartIds, clearCharts }) => {
     const styles = useStyles();
 
     filters = filters.map(filter => {
         const onChangeFunc = filter.onChange;
         filter.onChange = value => {
-            clearCharts();
-            onChangeFunc(value);
+            if (clearCharts) clearCharts();
+            if (onChangeFunc) onChangeFunc(value);
         };
         return filter;
     });
@@ -113,7 +113,7 @@ export const ExecutionFilters: React.FC<{
                     />
                 );
             })}
-            {chartIds.length > 0 && (
+            {chartIds && chartIds.length > 0 && (
                 <FilterPopoverButton
                     open={false}
                     active={true}
diff --git a/src/components/Executions/filters/types.ts b/src/components/Executions/filters/types.ts
index 9cac7f27c..c57799553 100644
--- a/src/components/Executions/filters/types.ts
+++ b/src/components/Executions/filters/types.ts
@@ -31,6 +31,7 @@ export interface FilterState {
     status?: string;
     getFilter: () => FilterOperation[];
     onReset: () => void;
+    onChange?: (value) => void;
 }
 
 export interface SingleFilterState<FilterKey extends string>