diff --git a/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.html b/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.html
index 13ef4386ac4..7f53df1c67f 100644
--- a/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.html
+++ b/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.html
@@ -21,7 +21,7 @@
   cdkDropList
   (cdkDropListDropped)="onDrop($event)">
   <div
-    *ngFor="let field of field.fieldGroup; let i = index"
+    *ngFor="let row of field.fieldGroup; let i = index"
     cdkDrag
     class="dnd-row">
     <div
@@ -35,7 +35,7 @@
 
     <div class="dnd-field-wrapper">
       <formly-field
-        *ngFor="let subField of field.fieldGroup"
+        *ngFor="let subField of row.fieldGroup"
         class="dnd-field"
         [field]="subField"></formly-field>
     </div>
diff --git a/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.spec.ts b/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.spec.ts
index 4589fa76ef7..2f0547f6396 100644
--- a/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.spec.ts
+++ b/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.spec.ts
@@ -149,6 +149,20 @@ describe("FormlyRepeatDndComponent", () => {
       expect(spy).toHaveBeenCalledWith(1);
     });
 
+    it("locks every remove button for a disabled section", () => {
+      render({ disabled: true });
+
+      expect(removeButtons()).toHaveLength(3);
+      expect(removeButtons().every(button => button.getAttribute("disabled") !== null)).toBe(true);
+    });
+
+    it("leaves every remove button available otherwise", () => {
+      render({ disabled: false });
+
+      expect(removeButtons()).toHaveLength(3);
+      expect(removeButtons().every(button => button.getAttribute("disabled") === null)).toBe(true);
+    });
+
     it("appends a row from the add button", () => {
       const spy = vi.spyOn(component, "add").mockImplementation(() => {});
       render();