diff --git a/src/components/pages/expense/ExpenseRequestContent.tsx b/src/components/pages/expense/ExpenseRequestContent.tsx
index 006c95d1..6146e110 100644
--- a/src/components/pages/expense/ExpenseRequestContent.tsx
+++ b/src/components/pages/expense/ExpenseRequestContent.tsx
@@ -408,9 +408,13 @@ const ExpenseRequestContent = ({
                   <th>Kandang</th>
                   <th>:</th>
                   <td>
-                    {initialValues?.kandangs
-                      .map((item) => item.name)
-                      .join(', ')}
+                    {initialValues?.kandangs &&
+                    initialValues?.kandangs.some((k) => k.name)
+                      ? initialValues?.kandangs
+                          .filter((item) => item.name)
+                          .map((item) => item.name)
+                          .join(', ')
+                      : '-'}
                   </td>
                 </tr>
                 <tr>
diff --git a/src/components/pages/expense/pdf/ExpensePDF.tsx b/src/components/pages/expense/pdf/ExpensePDF.tsx
index 5d057740..ce4a77f5 100644
--- a/src/components/pages/expense/pdf/ExpensePDF.tsx
+++ b/src/components/pages/expense/pdf/ExpensePDF.tsx
@@ -219,7 +219,13 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
     { label: 'Lokasi', value: expense?.location.name },
     {
       label: 'Kandang',
-      value: expense?.kandangs.map((item) => item.name).join(', '),
+      value:
+        expense?.kandangs && expense?.kandangs.some((k) => k.name)
+          ? expense?.kandangs
+              .filter((item) => item.name)
+              .map((item) => item.name)
+              .join(', ')
+          : '-',
     },
     { label: 'Vendor', value: expense?.supplier.name },
     {
@@ -500,7 +506,9 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
                 style={ExpensePDFStyle.kandangExpenseContainer}
               >
                 <Text style={ExpensePDFStyle.kandangExpenseTitle}>
-                  {kandangExpense.name}
+                  {kandangExpense.name
+                    ? `Biaya ${kandangExpense.name}`
+                    : `Biaya ${expense?.location.name || 'Umum'}`}
                 </Text>
 
                 <View style={ExpensePDFStyle.kandangExpenseTable}>