diff --git a/packages/@react-stately/select/src/useSelectState.ts b/packages/@react-stately/select/src/useSelectState.ts index e172b750c44..dd469c3f2c6 100644 --- a/packages/@react-stately/select/src/useSelectState.ts +++ b/packages/@react-stately/select/src/useSelectState.ts @@ -83,10 +83,10 @@ export function useSelectState; + return props.defaultValue !== undefined ? props.defaultValue : (selectionMode === 'single' ? props.defaultSelectedKey ?? null : []) as ValueType; }, [props.defaultValue, props.defaultSelectedKey, selectionMode]); let value = useMemo(() => { - return props.value ?? (selectionMode === 'single' ? props.selectedKey : undefined) as ValueType; + return props.value !== undefined ? props.value : (selectionMode === 'single' ? props.selectedKey : undefined) as ValueType; }, [props.value, props.selectedKey, selectionMode]); let [controlledValue, setControlledValue] = useControlledState>(value as any, defaultValue as any, props.onChange); let setValue = (value: Key | Key[] | null) => {