diff --git a/app/src/views/DrefApplicationForm/schema.ts b/app/src/views/DrefApplicationForm/schema.ts
index 98b285aed..f45b87809 100644
--- a/app/src/views/DrefApplicationForm/schema.ts
+++ b/app/src/views/DrefApplicationForm/schema.ts
@@ -390,6 +390,7 @@ const schema: DrefFormSchema = {
                             member: () => ({
                                 fields: (): SourceInformationFields => ({
                                     client_id: {},
+                                    id: { defaultValue: undefinedValue },
                                     source_name: {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
@@ -418,6 +419,7 @@ const schema: DrefFormSchema = {
                             member: () => ({
                                 fields: (): SourceInformationFields => ({
                                     client_id: {},
+                                    id: { defaultValue: undefinedValue },
                                     source_name: {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
@@ -587,6 +589,7 @@ const schema: DrefFormSchema = {
                         member: () => ({
                             fields: (): NationalSocietyFields => ({
                                 client_id: {},
+                                id: { defaultValue: undefinedValue },
                                 title: {
                                     required: true,
                                     requiredValidation: requiredStringCondition,
@@ -617,6 +620,7 @@ const schema: DrefFormSchema = {
                             member: () => ({
                                 fields: (): NeedsIdentifiedFields => ({
                                     client_id: {},
+                                    id: { defaultValue: undefinedValue },
                                     title: {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
@@ -874,6 +878,7 @@ const schema: DrefFormSchema = {
                         member: () => ({
                             fields: (): RiskSecurityFields => ({
                                 client_id: {},
+                                id: { defaultValue: undefinedValue },
                                 risk: {
                                     required: true,
                                     requiredValidation: requiredStringCondition,
@@ -893,6 +898,7 @@ const schema: DrefFormSchema = {
                         member: () => ({
                             fields: (): PlannedInterventionFields => ({
                                 client_id: {},
+                                id: { defaultValue: undefinedValue },
                                 title: {
                                     required: true,
                                     requiredValidation: requiredStringCondition,
@@ -915,6 +921,7 @@ const schema: DrefFormSchema = {
                                     member: () => ({
                                         fields: (): IndicatorFields => ({
                                             client_id: {},
+                                            id: { defaultValue: undefinedValue },
                                             title: {},
                                             target: { validations: [positiveNumberCondition] },
                                         }),
diff --git a/app/src/views/DrefFinalReportForm/schema.ts b/app/src/views/DrefFinalReportForm/schema.ts
index 4965c92ea..f9eacb83f 100644
--- a/app/src/views/DrefFinalReportForm/schema.ts
+++ b/app/src/views/DrefFinalReportForm/schema.ts
@@ -260,6 +260,7 @@ const schema: FinalReportFormSchema = {
                 member: () => ({
                     fields: (): RiskSecurityFields => ({
                         client_id: {},
+                        id: { defaultValue: undefinedValue },
                         risk: {
                             required: true,
                             requiredValidation: requiredStringCondition,
@@ -283,6 +284,7 @@ const schema: FinalReportFormSchema = {
                 member: () => ({
                     fields: (): PlannedInterventionFields => ({
                         client_id: {},
+                        id: { defaultValue: undefinedValue },
                         budget: {
                             required: true,
                             validations: [
@@ -323,6 +325,7 @@ const schema: FinalReportFormSchema = {
                             member: () => ({
                                 fields: (): IndicatorFields => ({
                                     client_id: {},
+                                    id: { defaultValue: undefinedValue },
                                     title: {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
@@ -409,6 +412,7 @@ const schema: FinalReportFormSchema = {
                         member: () => ({
                             fields: (): SourceInformationFields => ({
                                 client_id: {},
+                                id: { defaultValue: undefinedValue },
                                 source_name: {
                                     required: true,
                                     requiredValidation: requiredStringCondition,
@@ -489,6 +493,7 @@ const schema: FinalReportFormSchema = {
                             member: () => ({
                                 fields: (): NeedsIdentifiedFields => ({
                                     client_id: {},
+                                    id: { defaultValue: undefinedValue },
                                     title: {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
diff --git a/app/src/views/DrefOperationalUpdateForm/schema.ts b/app/src/views/DrefOperationalUpdateForm/schema.ts
index 5317b8e65..aa2f558f8 100644
--- a/app/src/views/DrefOperationalUpdateForm/schema.ts
+++ b/app/src/views/DrefOperationalUpdateForm/schema.ts
@@ -344,6 +344,7 @@ const schema: OpsUpdateFormSchema = {
                             member: () => ({
                                 fields: (): SourceInformationFields => ({
                                     client_id: {},
+                                    id: { defaultValue: undefinedValue },
                                     source_name: {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
@@ -476,6 +477,7 @@ const schema: OpsUpdateFormSchema = {
                             member: () => ({
                                 fields: (): NeedsIdentifiedFields => ({
                                     client_id: {},
+                                    id: { defaultValue: undefinedValue },
                                     title: {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
@@ -614,6 +616,7 @@ const schema: OpsUpdateFormSchema = {
                         member: () => ({
                             fields: (): RiskSecurityFields => ({
                                 client_id: {},
+                                id: { defaultValue: undefinedValue },
                                 risk: {
                                     required: true,
                                     requiredValidation: requiredStringCondition,
@@ -633,6 +636,7 @@ const schema: OpsUpdateFormSchema = {
                         member: () => ({
                             fields: (): PlannedInterventionFields => ({
                                 client_id: {},
+                                id: { defaultValue: undefinedValue },
                                 title: {
                                     required: true,
                                     requiredValidation: requiredStringCondition,
@@ -670,6 +674,7 @@ const schema: OpsUpdateFormSchema = {
                                     member: () => ({
                                         fields: (): IndicatorFields => ({
                                             client_id: {},
+                                            id: { defaultValue: undefinedValue },
                                             title: {},
                                             target: { validations: [positiveNumberCondition] },
                                             actual: {
diff --git a/go-api b/go-api
index 514e32751..b7fb5160d 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit 514e32751552d26a4542f9db72fa4b3559da6c20
+Subproject commit b7fb5160df7346b77db58ea1a8b9585484ce9c41