diff --git a/app/pages/analyst/cbc/[cbcId].tsx b/app/pages/analyst/cbc/[cbcId].tsx
index 52b64c997..3d4d0c878 100644
--- a/app/pages/analyst/cbc/[cbcId].tsx
+++ b/app/pages/analyst/cbc/[cbcId].tsx
@@ -219,7 +219,7 @@ const Cbc = ({
               : toggleOverrideReadOnly,
             isEditable: true,
             isCBC: true,
-            cbcId: cbcData.rowId,
+            cbcId: rowId,
             errors: formErrors,
           }}
           formData={formData}