diff --git a/src/components/EditStaff/EditStaff.tsx b/src/components/EditStaff/EditStaff.tsx
index fbe4323..d584c98 100644
--- a/src/components/EditStaff/EditStaff.tsx
+++ b/src/components/EditStaff/EditStaff.tsx
@@ -108,7 +108,7 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos }) => {
           haveError = true
           formProps.setError("phone1", { message: t("Please Enter Correct Phone No.."), type: "required" })
         }
-        if(!regex_phone.test(data.emergContactPhone)) {
+        if(data.emergContactPhone && !regex_phone.test(data.emergContactPhone)) {
           haveError = true
           formProps.setError("emergContactPhone", { message: t("Please Enter Correct Phone No.."), type: "required" })
         }
@@ -150,7 +150,7 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos }) => {
           haveError = true
           formProps.setError("joinDate", { message: t("Please Enter Join Date."), type: "required" })
         }
-        if (data.departDate && new Date(data.departDate) <= new Date(data.joinDate)) {
+        if (data.joinDate &&data.departDate && new Date(data.departDate) <= new Date(data.joinDate)) {
           haveError = true
           formProps.setError("departDate", { message: t("Depart Date cannot be earlier than Join Date."), type: "required" })
         }