diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index 5fe558f7..ece57877 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -810,6 +810,11 @@ async function submitService() {
 
   if (dialogService.value) {
     formDataProductService.value.productTypeId = currentIdType.value;
+
+    if (formDataProductService.value.registeredBranchId === '') {
+      formDataProductService.value.registeredBranchId = null;
+    }
+
     await createService(formDataProductService.value);
     totalService.value = totalService.value + 1;
   }
@@ -2075,6 +2080,10 @@ watch(inputSearchProductAndService, async () => {
         <BasicInformation
           dense
           service
+          :options-branch="branchOption"
+          v-model:registered-branch-id="
+            formDataProductService.registeredBranchId
+          "
           v-model:service-code="formDataProductService.code"
           v-model:service-description="formDataProductService.detail"
           v-model:service-name-th="formDataProductService.name"
@@ -2234,6 +2243,10 @@ watch(inputSearchProductAndService, async () => {
           v-if="currentServiceTab === 'serviceInformation'"
           dense
           service
+          :options-branch="branchOption"
+          v-model:registered-branch-id="
+            formDataProductService.registeredBranchId
+          "
           v-model:service-code="formDataProductService.code"
           v-model:service-description="formDataProductService.detail"
           v-model:service-name-th="formDataProductService.name"