diff --git a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
index 763d92f2d1f..7239e0b912d 100644
--- a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
+++ b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
@@ -34,7 +34,7 @@ const FacilitiesSelectDialog = (props: Props) => {
         <Cancel onClick={handleCancel} />
         <Submit
           onClick={handleOk}
-          disabled={!selectedFacility.id}
+          disabled={!selectedFacility?.id}
           label={t("select")}
           data-testid="submit-button"
         />
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index 41f36bffd35..c515e7584c1 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -72,8 +72,6 @@ import { FormContextValue } from "../Form/FormContext.js";
 const Loading = lazy(() => import("../Common/Loading"));
 const PageTitle = lazy(() => import("../Common/PageTitle"));
 
-// const debounce = require("lodash.debounce");
-
 interface PatientRegisterProps extends PatientModel {
   facilityId: string;
 }
@@ -1260,7 +1258,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                               required
                               label="Phone Number"
                               onChange={(event) => {
-                                duplicateCheck(event.value);
+                                if (!id) duplicateCheck(event.value);
                                 field("phone_number").onChange(event);
                               }}
                               types={["mobile", "landline"]}