diff --git a/apps/Frontend/src/components/appointments/appointment-form.tsx b/apps/Frontend/src/components/appointments/appointment-form.tsx
index c8da8537..1cdd592f 100755
--- a/apps/Frontend/src/components/appointments/appointment-form.tsx
+++ b/apps/Frontend/src/components/appointments/appointment-form.tsx
@@ -325,15 +325,6 @@ export function AppointmentForm({
                     setSelectOpen(open);
                     if (!open) {
                       setPatientSearchTerm("");
-                      if (
-                        prefillPatient &&
-                        patients &&
-                        patients.some(
-                          (p) => Number(p.id) === Number(prefillPatient.id)
-                        )
-                      ) {
-                        setPrefillPatient(null);
-                      }
                     } else {
                       if (!patients || patients.length === 0) refetchPatients();
                     }
@@ -348,9 +339,15 @@ export function AppointmentForm({
                       ? ""
                       : String(field.value)
                   }
-                  onValueChange={(val) =>
-                    field.onChange(val === "" ? undefined : Number(val))
-                  }
+                  onValueChange={(val) => {
+                    field.onChange(val === "" ? undefined : Number(val));
+                    if (val !== "") {
+                      const picked = patients.find(
+                        (p) => Number(p.id) === Number(val)
+                      );
+                      if (picked) setPrefillPatient(picked);
+                    }
+                  }}
                 >
                   <FormControl>
                     <SelectTrigger>