diff --git a/src/components/Form/FormSelect.tsx b/src/components/Form/FormSelect.tsx
index 42be6c11..414ce12c 100644
--- a/src/components/Form/FormSelect.tsx
+++ b/src/components/Form/FormSelect.tsx
@@ -39,11 +39,15 @@ export function SelectInput<T extends FieldValues>({
   disabled,
   field,
 }: GenericFormElementProps<T, SelectFieldProps<T>>) {
+  // Get default value and set it
+  const defaultValue = field.properties.defaultValue ?? field.defaultValue;
+
   const {
     field: { value, onChange, ...rest },
   } = useController({
     name: field.name,
     control,
+    defaultValue: defaultValue ? defaultValue.toString() : undefined,
   });
 
   const { enumValue, formatEnumName, ...remainingProperties } = field.properties;
@@ -76,6 +80,7 @@ export function SelectInput<T extends FieldValues>({
       onValueChange={handleValueChange}
       disabled={disabled}
       value={value?.toString()}
+      defaultValue={defaultValue?.toString()}
       {...remainingProperties}
       {...rest}
     >