diff --git a/web/src/components/QRFormWrapper/components/reference/hooks.ts b/web/src/components/QRFormWrapper/components/reference/hooks.ts
index 11c20888..69d1a5f6 100644
--- a/web/src/components/QRFormWrapper/components/reference/hooks.ts
+++ b/web/src/components/QRFormWrapper/components/reference/hooks.ts
@@ -70,9 +70,11 @@ export function useAnswerReference<R extends Resource = any, IR extends Resource
         action: ActionMeta<QuestionnaireItemAnswerOption>,
     ) => {
         if (!repeats || action.action !== 'select-option') {
-            onChange(selectedValue as SingleValue<QuestionnaireItemAnswerOption>);
-        } else if (repeats || action.action === 'select-option') {
-            onChange(selectedValue as MultiValue<QuestionnaireItemAnswerOption>);
+            if (Array.isArray(selectedValue)) {
+                onChange(selectedValue as MultiValue<QuestionnaireItemAnswerOption>);
+            } else {
+                onChange(selectedValue as SingleValue<QuestionnaireItemAnswerOption>);
+            }
         }
     };