diff --git a/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
index 812235b2a..62fa0fe9d 100644
--- a/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
@@ -147,7 +147,6 @@ onMounted(() => {
       <div class="row q-col-gutter-sm">
         <div class="col-2">
           <datepicker
-            menu-class-name="modalfix"
             v-model="form.year"
             :locale="'th'"
             autoApply
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index e33d0c816..939b48704 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -274,7 +274,6 @@ onMounted(async () => {
           </div>
           <div class="col-2">
             <datepicker
-              menu-class-name="modalfix"
               v-model="year"
               :locale="'th'"
               autoApply
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index efc700d16..c63aa27a3 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -308,7 +308,6 @@ onMounted(() => {
           </div>
           <div class="col-2">
             <datepicker
-              menu-class-name="modalfix"
               v-model="form.year"
               :locale="'th'"
               autoApply
diff --git a/src/modules/01_masterdata/views/Assignment.vue b/src/modules/01_masterdata/views/Assignment.vue
index ee4f43807..250063b18 100644
--- a/src/modules/01_masterdata/views/Assignment.vue
+++ b/src/modules/01_masterdata/views/Assignment.vue
@@ -186,7 +186,6 @@ onMounted(() => {
         <div class="row q-gutter-sm">
           <datepicker
             style="width: 150px"
-            menu-class-name="modalfix"
             v-model="formFilter.year"
             :locale="'th'"
             autoApply
diff --git a/src/modules/01_masterdata/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
index e8cb74971..62684a093 100644
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -277,7 +277,6 @@ onMounted(() => {
       <div class="col-12">
         <div class="row q-col-gutter-sm items-center q-mb-sm no-wrap">
           <datepicker
-            menu-class-name="modalfix"
             v-model="year"
             :locale="'th'"
             autoApply
diff --git a/src/modules/01_masterdata/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
index caa472d1a..934ea5c22 100644
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -316,7 +316,6 @@ onMounted(async () => {
 
       <datepicker
         style="width: 150px"
-        menu-class-name="modalfix"
         v-model="formFilter.year"
         :locale="'th'"
         autoApply