diff --git a/frontend/components/analysis/AnalysisForm.tsx b/frontend/components/analysis/AnalysisForm.tsx
index 6a5d22c2..d65b3071 100644
--- a/frontend/components/analysis/AnalysisForm.tsx
+++ b/frontend/components/analysis/AnalysisForm.tsx
@@ -172,7 +172,7 @@ export function AnalysisForm({ onSubmit, loading = false }: AnalysisFormProps) {
                                       onCheckedChange={(checked) => {
                                         return checked
                                           ? field.onChange([
-                                              ...field.value,
+                                              ...(field.value ?? []),
                                               analyst.value,
                                             ])
                                           : field.onChange(
@@ -246,7 +246,7 @@ export function AnalysisForm({ onSubmit, loading = false }: AnalysisFormProps) {
                         onValueChange={(value) =>
                           field.onChange(parseInt(value))
                         }
-                        defaultValue={field.value.toString()}
+                        defaultValue={field.value?.toString() ?? "3"}
                       >
                         <FormControl>
                           <SelectTrigger>