diff --git a/src/components/ColorPicker/ColorPicker.tsx b/src/components/ColorPicker/ColorPicker.tsx
index e7becbe11..8b15e01fa 100644
--- a/src/components/ColorPicker/ColorPicker.tsx
+++ b/src/components/ColorPicker/ColorPicker.tsx
@@ -143,7 +143,7 @@ export const ColorPicker: React.FC<ColorPickerProps> = ({
           helperText={errors?.value}
           className={classes.colorInput}
           InputProps={{ startAdornment: "HEX" }}
-          inputProps={{ pattern: "[A-Za-z0-9]{6}", maxLength: 6 }}
+          inputProps={{ pattern: "[A-Za-z0-9]{6}", maxLength: 7 }}
           value={`#${hex}`}
           onChange={event => handleHEXChange(event.target.value)}
         />
diff --git a/src/components/Filter/FilterAutocompleteField.tsx b/src/components/Filter/FilterAutocompleteField.tsx
index 488c74f86..42b59cce9 100644
--- a/src/components/Filter/FilterAutocompleteField.tsx
+++ b/src/components/Filter/FilterAutocompleteField.tsx
@@ -60,7 +60,7 @@ const FilterAutocompleteField: React.FC<FilterAutocompleteFieldProps> = ({
 }) => {
   const classes = useStyles({});
 
-  const fieldDisplayValues = displayValues[filter.name];
+  const fieldDisplayValues = displayValues[filter.name] ?? [];
   const initialFieldDisplayValues = initialDisplayValues[filter.name];
   const availableOptions = filter.options.filter(option =>
     fieldDisplayValues.every(
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index a7e2ffef7..aaec0be2a 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -5912,7 +5912,7 @@ exports[`Storyshots Generics / ColorPicker default 1`] = `
             <input
               aria-invalid="false"
               class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedStart-id MuiOutlinedInput-inputAdornedStart-id"
-              maxlength="6"
+              maxlength="7"
               pattern="[A-Za-z0-9]{6}"
               type="text"
               value="#000000"