diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index f043c8643..e920ac519 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -139,7 +139,7 @@ const formData = reactive<FormData>({
 const rows = ref([]);
 const dateEndInputStyle = computed(() => {
   if(formData.investigationDateStart){
-  const currentDate = new Date(formData.investigationDateStart as Date);
+  const currentDate = new Date();
   const investigationDateEnd = new Date(formData.investigationDateEnd as Date);
 
   const isInNext7Days =
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 916e48468..2841a3cfe 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -180,9 +180,9 @@ const emit = defineEmits(["submit:disciplinary"]);
 
 const dateEndInputStyle = computed(() => {
   if (formData.disciplinaryDateStart) {
-    const currentDate = new Date(formData.disciplinaryDateStart as Date);
+    const currentDate = new Date();
     const investigationDateEnd = new Date(formData.disciplinaryDateEnd as Date);
-
+    
     const isInNext7Days =
       investigationDateEnd >= currentDate &&
       investigationDateEnd <=