diff --git a/packages/eds-core-react/src/components/Autocomplete/Autocomplete.tsx b/packages/eds-core-react/src/components/Autocomplete/Autocomplete.tsx
index db5594c470..9d431b4620 100644
--- a/packages/eds-core-react/src/components/Autocomplete/Autocomplete.tsx
+++ b/packages/eds-core-react/src/components/Autocomplete/Autocomplete.tsx
@@ -467,7 +467,7 @@ function AutocompleteInner<T>(
   const allDisabled = enabledItems.length === 0
 
   const selectedDisabledItemsSet = useMemo(
-    () => new Set(selectedItems.filter(optionDisabled)),
+    () => new Set(selectedItems.filter((x) => x !== null && optionDisabled(x))),
     [selectedItems, optionDisabled],
   )