diff --git a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
index ef50d6ced..3b5a0f634 100644
--- a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
@@ -368,7 +368,7 @@ watch(
             dense
             class="custom-header-table"
             :visible-columns="dataStore.visibleColumnsHistory"
-            :rows-per-page-options="[1, 10, 25, 50, 100]"
+            :rows-per-page-options="[10, 25, 50, 100]"
             :pagination="initialPagination"
             @update:pagination="updatePagination"
           >
@@ -402,7 +402,7 @@ watch(
               <q-tr :props="props" class="cursor-pointer">
                 <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <div>
-                    {{ col.value }}
+                    {{ col.value ?? "-" }}
                   </div>
                 </q-td>
               </q-tr>
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 53334f149..4083c11e4 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -149,7 +149,9 @@ export const useChangeRoundDataStore = defineStore(
                 roundStart: e.startTimeMorning,
                 roundEnd: e.leaveTimeAfterNoon,
                 currentRound: `${e.startTimeMorning}-${e.leaveTimeAfterNoon}`,
-                effectiveDate: date2Thai(e.effectiveDate) ?? "-",
+                effectiveDate: e.effectiveDate
+                  ? date2Thai(e.effectiveDate)
+                  : "-",
               }));
             } else {
               rows.value = [];
diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index c0ab50381..ed4cb68b9 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -293,7 +293,7 @@ watch(
             </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div>
-                {{ col.value }}
+                {{ col.value ?? '-' }}
               </div>
             </q-td>
           </q-tr>