diff --git a/src/modules/04_registry/components/Education.vue b/src/modules/04_registry/components/Education.vue
index 8c58ef6fd..fef013fe2 100644
--- a/src/modules/04_registry/components/Education.vue
+++ b/src/modules/04_registry/components/Education.vue
@@ -38,7 +38,7 @@
                 }}
               </div>
               <div v-else-if="col.name == 'finishDate'" class="table_ellipsis">
-                {{ date2Thai(col.value) }}
+                {{ col.value ? date2Thai(col.value) : "-" }}
               </div>
               <div v-else-if="col.name == 'isEducation'" class="table_ellipsis">
                 {{ col.value ? "ใช่" : "ไม่ใช่" }}
@@ -1138,7 +1138,7 @@ const fetchData = async () => {
             other: e.other ? e.other : "-",
             fundName: e.fundName,
             isDate: e.isDate == null ? null : e.isDate.toString(),
-            finishDate: e.finishDate ? new Date(e.finishDate) : "-",
+            finishDate: e.finishDate ? new Date(e.finishDate) : null,
             startDate: new Date(e.startDate).getFullYear(),
             endDate: new Date(e.endDate).getFullYear(),
             startDate2: new Date(e.startDate),
@@ -1194,7 +1194,7 @@ const getData = () => {
   durationYear.value = row.durationYear;
   other.value = row.other;
   fundName.value = row.fundName;
-  finishDate.value = row.finishDate;
+  finishDate.value = row.finishDate ? row.finishDate : null;
   isDate.value = row.isDate;
   startDate.value = row.startDate;
   endDate.value = row.endDate;
@@ -1425,7 +1425,7 @@ const selectData = async (_props: DataProps) => {
   durationYear.value = _props.row.durationYear;
   other.value = _props.row.other;
   fundName.value = _props.row.fundName;
-  finishDate.value = _props.row.finishDate;
+  finishDate.value = _props.row.finishDate ? _props.row.finishDate : null;
   isDate.value = _props.row.isDate;
   startDate.value = _props.row.startDate;
   endDate.value = _props.row.endDate;