diff --git a/app/components/app/specialist/entry-form.vue b/app/components/app/specialist/entry-form.vue
index d3391208..7254ec98 100644
--- a/app/components/app/specialist/entry-form.vue
+++ b/app/components/app/specialist/entry-form.vue
@@ -4,7 +4,7 @@ import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
 import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
 import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
 import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
+// import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
 
 // Types
 import type { SpecialistFormData } from '~/schemas/specialist.schema.ts'
@@ -89,8 +89,8 @@ function onCancelForm() {
       </Cell>
       <Cell>
         <Label height="compact">Unit</Label>
-        <Field :errMessage="errors.uom_code">
-          <Combobox
+        <Field :errMessage="errors.unit">
+          <!-- <Combobox
             id="unit"
             placeholder="Pilih Unit"
             search-placeholder="Cari unit"
@@ -99,6 +99,15 @@ function onCancelForm() {
             v-bind="unitAttrs"
             :items="units"
             :disabled="isLoading || isReadonly"
+          /> -->
+          <Select
+            id="unit"
+            icon-name="i-lucide-chevron-down"
+            placeholder="Pilih unit"
+            v-model="unit"
+            v-bind="unitAttrs"
+            :items="units"
+            :disabled="isLoading || isReadonly"
           />
         </Field>
       </Cell>
diff --git a/app/components/app/specialist/list-cfg.ts b/app/components/app/specialist/list-cfg.ts
index afce3e16..79685879 100644
--- a/app/components/app/specialist/list-cfg.ts
+++ b/app/components/app/specialist/list-cfg.ts
@@ -28,6 +28,10 @@ export const funcParsed: RecStrFuncUnknown = {
     const recX = rec as SmallDetailDto
     return `${recX.name}`.trim()
   },
+  unit: (rec: unknown): unknown => {
+    const recX = rec as SmallDetailDto
+    return `${recX.unit_id}`
+  },
 }
 
 export const funcComponent: RecStrFuncComponent = {
diff --git a/app/components/content/specialist/list.vue b/app/components/content/specialist/list.vue
index 9f3c9ef8..d1c3bb21 100644
--- a/app/components/content/specialist/list.vue
+++ b/app/components/content/specialist/list.vue
@@ -97,7 +97,7 @@ const getUnitList = async () => {
   const result = await getUnits()
   if (result.success) {
     const currentUnits = result.body?.data || []
-    units.value = currentUnits.map((item: Unit) => ({ value: item.code, label: item.name }))
+    units.value = currentUnits.map((item: Unit) => ({ value: item.id ? Number(item.id) : item.code, label: item.name }))
   }
 }
 
diff --git a/app/models/specialist.ts b/app/models/specialist.ts
index 0a27f023..9d8f01c3 100644
--- a/app/models/specialist.ts
+++ b/app/models/specialist.ts
@@ -1,5 +1,5 @@
 export interface Specialist {
   code: string
   name: string
-  unit_id: number
+  unit_id: number | string
 }
diff --git a/app/models/unit.ts b/app/models/unit.ts
index adcea902..27348354 100644
--- a/app/models/unit.ts
+++ b/app/models/unit.ts
@@ -1,4 +1,5 @@
 export interface Unit {
+  id?: number
   code: string
   name: string
   installation?: string | number
diff --git a/app/schemas/specialist.schema.ts b/app/schemas/specialist.schema.ts
index ed52d76a..10715d20 100644
--- a/app/schemas/specialist.schema.ts
+++ b/app/schemas/specialist.schema.ts
@@ -4,7 +4,7 @@ import type { Specialist } from '~/models/specialist'
 const SpecialistSchema = z.object({
   code: z.string({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
   name: z.string({ required_error: 'Nama harus diisi' }).min(1, 'Nama minimum 1 karakter'),
-  unit_id: z.number().optional(),
+  unit_id: z.number().positive('Unit harus diisi'),
 })
 
 type SpecialistFormData = z.infer<typeof SpecialistSchema> & Specialist