1 files changed, 7 insertions, 5 deletions
diff --git a/src/hooks/useOptions.ts b/src/hooks/useOptions.ts
index de8fc95..2a5aee6 100644
--- a/src/hooks/useOptions.ts
+++ b/src/hooks/useOptions.ts
@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+import _ from 'lodash';
 import { Option } from '../components/Select';
 import hooks from './useAPIClient';
 
@@ -6,7 +7,7 @@ import hooks from './useAPIClient';
 // setting the default value in formik
 const useOptions = (
   service: string,
-  field: string,
+  fields: string[],
   values: Record<string, any>,
   setFieldValue: (any) => void,
   mapper = item => ({ key: item._id, label: item.name }),
@@ -16,10 +17,11 @@ const useOptions = (
   const options = items?.map(mapper);
 
   useEffect(() => {
-    if (items?.length && !values[field]) {
-      setFieldValue(field, items[0]._id);
-    }
-  }, [items, setFieldValue]);
+    // Initialize all empty fields
+    if (items?.length) fields.forEach(field => {
+      if (!_.get(values, field)) setFieldValue(field, items[0]._id);
+    });
+  }, [items, values, setFieldValue]);
 
   return options;
 };