diff --git a/src/components/forms/custom-form-builder.tsx b/src/components/forms/custom-form-builder.tsx
index 034c091..0c8ca48 100644
--- a/src/components/forms/custom-form-builder.tsx
+++ b/src/components/forms/custom-form-builder.tsx
@@ -330,7 +330,13 @@ export function CustomFormBuilder() {
     if (selectedCaseId) {
       customValues = await fetchCaseCustomValues(selectedCaseId);
     }
-    return { client, homeowner, firmName: firm?.company_name ?? "", customValues };
+    return {
+      client,
+      homeowner,
+      firmName: firm?.company_name ?? "",
+      customValues,
+      fieldValues,
+    };
   };
 
   const renderTitle = (ctx: any) => applyVariables(title, ctx);