diff --git a/ui/js/src/main/scala/works/iterative/ui/components/laminar/forms/FieldBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/components/laminar/forms/FieldBuilder.scala
index 5cfb7c6..8c2de27 100644
--- a/ui/js/src/main/scala/works/iterative/ui/components/laminar/forms/FieldBuilder.scala
+++ b/ui/js/src/main/scala/works/iterative/ui/components/laminar/forms/FieldBuilder.scala
@@ -121,11 +121,12 @@
           fieldDescriptor: FieldDescriptor,
           initialValue: Option[A]
       ): FormComponent[A] =
+        val options = summon[Choice[A]].options
         ChoiceField(
           fieldDescriptor,
-          initialValue,
+          Some(initialValue.getOrElse(options.head.value)),
           Validations.requiredA(fieldDescriptor.label)(_),
-          summon[Choice[A]].options
+          options
         )
 
   given optionalChoiceInput[A, B](using Choice[A], FormBuilderContext)(using