diff --git a/src/components/forms/custom-form-builder.tsx b/src/components/forms/custom-form-builder.tsx
index 7d62289..d891614 100644
--- a/src/components/forms/custom-form-builder.tsx
+++ b/src/components/forms/custom-form-builder.tsx
@@ -318,9 +318,19 @@ export function CustomFormBuilder() {
   useEffect(() => {
     fetchFirm().then(setFirm);
     fetchCustomFieldDefs().then(setCustomDefs);
+    fetchClientCustomFieldDefs().then(setClientCustomDefs);
     loadTemplates();
   }, []);
 
+  // Load client custom field values whenever the selected client changes.
+  useEffect(() => {
+    if (!client?.id) {
+      setClientCustomValues({});
+      return;
+    }
+    fetchClientCustomValues(client.id).then(setClientCustomValues);
+  }, [client?.id]);
+
   const loadTemplates = async () => {
     const { data } = await supabase
       .from("custom_form_templates")