1 files changed, 5 insertions, 4 deletions
diff --git a/modern/src/form/SelectField.js b/modern/src/form/SelectField.js
index fa51a36..b179c58 100644
--- a/modern/src/form/SelectField.js
+++ b/modern/src/form/SelectField.js
@@ -7,7 +7,8 @@ const SelectField = ({
   variant,
   label,
   multiple,
-  defaultValue,
+  value,
+  emptyValue = 0,
   onChange,
   endpoint,
   data,
@@ -31,10 +32,10 @@ const SelectField = ({
         <InputLabel>{label}</InputLabel>
         <Select
           multiple={multiple}
-          defaultValue={defaultValue}
+          value={value}
           onChange={onChange}>
-          {!multiple &&
-            <MenuItem value={0}>&nbsp;</MenuItem>
+          {!multiple && emptyValue !== null &&
+            <MenuItem value={emptyValue}>&nbsp;</MenuItem>
           }
           {items.map(item => (
             <MenuItem key={keyGetter(item)} value={keyGetter(item)}>{titleGetter(item)}</MenuItem>