diff --git a/src/services/ui/src/components/RHF/FieldArray.tsx b/src/services/ui/src/components/RHF/FieldArray.tsx
index 6824f1367a..1f5e2c59ef 100644
--- a/src/services/ui/src/components/RHF/FieldArray.tsx
+++ b/src/services/ui/src/components/RHF/FieldArray.tsx
@@ -31,9 +31,9 @@ export const RHFFieldArray = <TFields extends FieldValues>(
         return (
           <div className="flex flex-row gap-3" key={FLD.id}>
             {props.fields.map((SLOT) => {
-              const adjustedPrefix =
-                (props.groupNamePrefix ?? "") + `${props.name}.${index}.`;
-              const adjustedSlotName = adjustedPrefix + SLOT.name;
+              const prefix = `${props.name}.${index}.`;
+              const adjustedPrefix = (props.groupNamePrefix ?? "") + prefix;
+              const adjustedSlotName = prefix + SLOT.name;
               return (
                 <FormField
                   key={adjustedSlotName}
diff --git a/src/services/ui/src/components/RHF/FieldGroup.tsx b/src/services/ui/src/components/RHF/FieldGroup.tsx
index d99ace094d..2c66018832 100644
--- a/src/services/ui/src/components/RHF/FieldGroup.tsx
+++ b/src/services/ui/src/components/RHF/FieldGroup.tsx
@@ -31,9 +31,9 @@ export const FieldGroup = <TFields extends FieldValues>(
         return (
           <div className="flex flex-col gap-3" key={FLD.id}>
             {props.fields.map((SLOT) => {
-              const adjustedPrefix =
-                (props.groupNamePrefix ?? "") + `${props.name}.${index}.`;
-              const adjustedSlotName = adjustedPrefix + SLOT.name;
+              const prefix = `${props.name}.${index}.`;
+              const adjustedPrefix = (props.groupNamePrefix ?? "") + prefix;
+              const adjustedSlotName = prefix + SLOT.name;
               return (
                 <FormField
                   key={adjustedSlotName}