diff --git a/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx b/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx
index a92649f..2d4002c 100644
--- a/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx
+++ b/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx
@@ -113,7 +113,7 @@ const AutoCompleteEntitySelect = <
 
   return (
     <AutoCompleteSelect<Value, Label, Multiple>
-      value={value}
+      {...(options.length && { value })}
       onChange={onChange}
       label={label}
       multiple={multiple}