diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index 7842de7e9..2acfd5cd7 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -212,10 +212,9 @@ function formatHistoryData(data: HistoryPos[]) {
 function formatHistoryOwnerData(data: HistoryPos[]) {
   return data.map((item) => ({
     ...item,
-    fullname:
-      item.firstName
-        ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
-        : "ว่าง",
+    fullname: item.firstName
+      ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
+      : "ว่าง",
   }));
 }
 
@@ -266,7 +265,9 @@ watch(
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 <div v-if="col.name == 'no'">
                   {{
-                    store.typeOrganizational === "current"
+                    store.typeOrganizational === "current" ||
+                    (store.typeOrganizational === "draft" &&
+                      historyType === "OWNER_HISTORY")
                       ? props.rowIndex + 1
                       : props.rowIndex + 1 == 1
                       ? "1 (แบบร่าง)"