diff --git a/src/components/Fields/DocSelect.tsx b/src/components/Fields/DocSelect.tsx
index 37d750c0..f39316f8 100644
--- a/src/components/Fields/DocSelect.tsx
+++ b/src/components/Fields/DocSelect.tsx
@@ -75,6 +75,7 @@ const DocSelect = (props: Props) => {
       {value &&
         value.map((doc: any, index: number) => (
           <Chip
+            key={doc.docPath}
             label={config.primaryKeys.map(
               (key: any) => `${doc.snapshot[key]} `
             )}
diff --git a/src/components/Fields/MultiSelect.tsx b/src/components/Fields/MultiSelect.tsx
index 54e0885d..b37bd0d9 100644
--- a/src/components/Fields/MultiSelect.tsx
+++ b/src/components/Fields/MultiSelect.tsx
@@ -77,7 +77,6 @@ const MultiSelect = (props: Props) => {
         className={classes.select}
         multiple
         value={value ? value : []}
-        defaultValue={[]}
         onChange={handleChange}
         input={<Input id="select-multiple-chip" />}
         renderValue={selected => (
diff --git a/src/components/Fields/index.tsx b/src/components/Fields/index.tsx
index 56a8879f..68bb72ed 100644
--- a/src/components/Fields/index.tsx
+++ b/src/components/Fields/index.tsx
@@ -63,7 +63,7 @@ export const isFieldType = (fieldType: any) => {
 export const FieldsDropDown = (value: FieldType | null, onChange: any) => {
   return (
     <Select
-      value={value}
+      value={value ? value : ""}
       onChange={onChange}
       inputProps={{
         name: "type",
@@ -73,7 +73,11 @@ export const FieldsDropDown = (value: FieldType | null, onChange: any) => {
       {FIELDS.map(
         (field: { icon: JSX.Element; name: string; type: FieldType }) => {
           return (
-            <MenuItem id={`select-field-${field.type}`} value={field.type}>
+            <MenuItem
+              key={`select-field-${field.name}`}
+              id={`select-field-${field.type}`}
+              value={field.type}
+            >
               <>{field.name}</>
             </MenuItem>
           );