diff --git a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue b/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
index 56310434a..ad6f3f720 100644
--- a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
+++ b/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
@@ -16,7 +16,7 @@ import { useQuasar } from "quasar";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { showLoader, dialogConfirm, success, messageError } = mixin;
+const { dialogConfirm, success, messageError } = mixin;
 
 /** propsData จาก RoundMain */
 const props = defineProps({
diff --git a/src/modules/09_leave/views/RoundMain.vue b/src/modules/09_leave/views/RoundMain.vue
index cc98f7782..2fbae0053 100644
--- a/src/modules/09_leave/views/RoundMain.vue
+++ b/src/modules/09_leave/views/RoundMain.vue
@@ -229,7 +229,7 @@ const pagination = ref({
             </q-td>
             <q-td>
               <q-btn
-                v-if="props.row.isActive === false"
+                v-if="props.row.isDefault === false"
                 dense
                 flat
                 round
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 9909212ec..d5b93d965 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -376,11 +376,12 @@ export const useCounterMixin = defineStore("mixin", () => {
             },
           });
         } else {
+          const message = e.response.data.result ?? e.response.data.message;
           q.dialog({
             component: CustomComponent,
             componentProps: {
               title: `พบข้อผิดพลาด`,
-              message: `${e.response.data.message}`,
+              message: `${message}`,
               icon: "warning",
               color: "red",
               onlycancel: true,