diff --git a/src/Components/Common/DiagnosisSelectFormField.tsx b/src/Components/Common/DiagnosisSelectFormField.tsx
index 4086664d4ba..5d8798d3b05 100644
--- a/src/Components/Common/DiagnosisSelectFormField.tsx
+++ b/src/Components/Common/DiagnosisSelectFormField.tsx
@@ -10,7 +10,10 @@ import {
 
 type Props =
   // | ({ multiple?: false | undefined } & FormFieldBaseProps<ICD11DiagnosisModel>) // uncomment when single select form field is required and implemented.
-  { multiple: true } & FormFieldBaseProps<ICD11DiagnosisModel[]>;
+  {
+    multiple: true;
+    excludeOptions?: ICD11DiagnosisModel[];
+  } & FormFieldBaseProps<ICD11DiagnosisModel[]>;
 
 export function DiagnosisSelectFormField(props: Props) {
   const field = useFormFieldPropsResolver(props);
@@ -32,7 +35,9 @@ export function DiagnosisSelectFormField(props: Props) {
         disabled={field.disabled}
         value={field.value || []}
         onChange={field.handleChange}
-        options={options(props.value)}
+        options={options(props.value).filter(
+          (val) => !props.excludeOptions?.find((ex) => ex.id === val.id)
+        )}
         optionLabel={(option) => option.label}
         optionValue={(option) => option}
         onQuery={(query) =>
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 01a5f02b7b1..782f6ac6910 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -324,15 +324,28 @@ export const ConsultationForm = (props: any) => {
           verified_by: "Declared Dead",
         },
       });
-    } else if (
-      event.name === "icd11_diagnoses_object" ||
-      event.name === "icd11_provisional_diagnoses_object"
-    ) {
+    } else if (event.name === "icd11_diagnoses_object") {
+      const selectedDiagnoses = event.value as ICD11DiagnosisModel[];
+      const provisionalDiagnoses =
+        state.form.icd11_provisional_diagnoses_object.filter(
+          (d) => !selectedDiagnoses.map((d) => d.id).includes(d.id)
+        );
       dispatch({
         type: "set_form",
         form: {
           ...state.form,
-          [event.name]: event.value,
+          icd11_diagnoses_object: selectedDiagnoses,
+          icd11_provisional_diagnoses_object: provisionalDiagnoses,
+          icd11_principal_diagnosis: undefined,
+        },
+      });
+    } else if (event.name === "icd11_provisional_diagnoses_object") {
+      dispatch({
+        type: "set_form",
+        form: {
+          ...state.form,
+          icd11_provisional_diagnoses_object:
+            event.value as ICD11DiagnosisModel[],
           icd11_principal_diagnosis: undefined,
         },
       });
@@ -421,7 +434,7 @@ export const ConsultationForm = (props: any) => {
   const validateForm = () => {
     const errors = { ...initError };
     let invalidForm = false;
-
+    console.log("Errors", errors);
     Object.keys(state.form).forEach((field) => {
       switch (field) {
         case "symptoms":
@@ -1203,6 +1216,7 @@ export const ConsultationForm = (props: any) => {
                       {...field("icd11_provisional_diagnoses_object")}
                       multiple
                       label="Provisional Diagnosis"
+                      excludeOptions={state.form.icd11_diagnoses_object}
                     />
                   </div>