diff --git a/src/modules/04_registryNew/components/DialogAddData.vue b/src/modules/04_registryNew/components/DialogAddData.vue
index 44b9f34ab..0ddfae294 100644
--- a/src/modules/04_registryNew/components/DialogAddData.vue
+++ b/src/modules/04_registryNew/components/DialogAddData.vue
@@ -119,6 +119,12 @@ function closeDialog() {
   clearFormData();
 }
 
+const calculateMaxDate = () => {
+  const today = new Date();
+  today.setFullYear(today.getFullYear() - 18);
+  return today;
+};
+
 function clearFormData() {
   formData.prefix = "";
   formData.firstName = "";
@@ -195,7 +201,6 @@ watch(
                 hide-bottom-space
                 :rules="[
                   (val) => {
-                    console.log(val);
                     return val.length > 0 || 'กรุณาเลือกคำนำหน้าชื่อ';
                   },
                 ]"
@@ -265,6 +270,8 @@ watch(
                 autoApply
                 borderless
                 week-start="0"
+                :max-date="calculateMaxDate()"
+                :enableTimePicker="false"
                 menu-class-name="modalfix"
                 v-model="formData.birthDate"
                 :locale="'th'"
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
index 8c2b3b577..952c8a71e 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
@@ -267,6 +267,12 @@ async function getData() {
     });
 }
 
+const calculateMaxDate = () => {
+  const today = new Date();
+  today.setFullYear(today.getFullYear() - 18);
+  return today;
+};
+
 async function editData() {
   showLoader();
   await http
@@ -550,7 +556,9 @@ onMounted(async () => {
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 autoApply
+                :max-date="calculateMaxDate()"
                 borderless
+                :enableTimePicker="false"
                 week-start="0"
                 menu-class-name="modalfix"
                 v-model="formData.birthDate"