diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 6b3408fd..4ee443f5 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -1027,23 +1027,53 @@ const emptyCreateDialog = ref(false);
                           </div>
                         </q-td>
                         <q-td v-if="fieldSelected.includes('businessTypePure')">
-                          {{ props.row.branch?.[0].businessType || '-' }}
+                          {{
+                            props.row.branch.length !== 0
+                              ? props.row.branch[0].businessType !== null
+                                ? props.row.branch[0].businessType
+                                : ''
+                              : '-'
+                          }}
                         </q-td>
 
                         <q-td v-if="fieldSelected.includes('address')">
-                          {{ props.row.branch?.[0].address || '-' }}
+                          {{
+                            props.row.branch.length !== 0
+                              ? props.row.branch[0].address !== null
+                                ? props.row.branch[0].address
+                                : ''
+                              : '-'
+                          }}
                         </q-td>
 
                         <q-td v-if="fieldSelected.includes('workPlace')">
-                          {{ props.row.branch?.[0].workplace || '-' }}
+                          {{
+                            props.row.branch.length !== 0
+                              ? props.row.branch[0].workplace !== null
+                                ? props.row.branch[0].workplace
+                                : ''
+                              : '-'
+                          }}
                         </q-td>
 
                         <q-td v-if="fieldSelected.includes('contactName')">
-                          {{ props.row.branch?.[0].contactName || '-' }}
+                          {{
+                            props.row.branch.length !== 0
+                              ? props.row.branch[0].contactName !== null
+                                ? props.row.branch[0].contactName
+                                : ''
+                              : '-'
+                          }}
                         </q-td>
 
                         <q-td v-if="fieldSelected.includes('contactPhone')">
-                          {{ props.row.branch?.[0].telephoneNo || '-' }}
+                          {{
+                            props.row.branch.length !== 0
+                              ? props.row.branch[0].telephoneNo !== null
+                                ? props.row.branch[0].telephoneNo
+                                : ''
+                              : '-'
+                          }}
                         </q-td>
 
                         <q-td>