diff --git a/src/components/pages/finance/FinanceDetail.tsx b/src/components/pages/finance/FinanceDetail.tsx
index 06eb730e..0887e029 100644
--- a/src/components/pages/finance/FinanceDetail.tsx
+++ b/src/components/pages/finance/FinanceDetail.tsx
@@ -25,7 +25,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
   const informasiUmum = [
     {
       label: 'ID',
-      value: finance.payment_code,
+      value: finance.payment_code || '-',
     },
     {
       label: 'Jenis Transaksi',
@@ -39,11 +39,13 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
     },
     {
       label: 'Tanggal',
-      value: formatDate(finance.payment_date, 'DD MMM yyyy'),
+      value: finance.payment_date
+        ? formatDate(finance.payment_date, 'DD MMM yyyy')
+        : '-',
     },
     {
       label: 'Metode Pembayaran',
-      value: finance.payment_method,
+      value: finance.payment_method || '-',
     },
     {
       label: 'Catatan',
@@ -62,22 +64,22 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
         : '-',
     },
     {
-      label: `Rekening ${formatTitleCase(finance.party?.type)}`,
-      value: finance.party?.account_number,
+      label: `Rekening ${formatTitleCase(finance.party?.type || '')}`,
+      value: finance.party?.account_number || '-',
     },
     {
       label: 'Nominal',
       value: formatCurrency(
         finance.transaction_type === 'INJECTION'
-          ? finance.nominal
-          : Math.abs(finance.nominal)
+          ? finance.nominal || 0
+          : Math.abs(finance.nominal || 0)
       ),
     },
   ].filter((item) => {
     // Hide party account number row if transaction type is INJECTION
     if (
-      FINANCE_INJECTION_STATUS.includes(finance.transaction_type) &&
-      item.label === `Rekening ${formatTitleCase(finance.party?.type)}`
+      FINANCE_INJECTION_STATUS.includes(finance.transaction_type || '') &&
+      item.label === `Rekening ${formatTitleCase(finance.party?.type || '')}`
     ) {
       return false;
     }
@@ -151,7 +153,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
       </Card>
 
       <div className='flex flex-row gap-2 justify-end'>
-        {FINANCE_TRANSACTION_STATUS.includes(finance.transaction_type) &&
+        {FINANCE_TRANSACTION_STATUS.includes(finance.transaction_type || '') &&
           finance.party?.type !== 'SUPPLIER' && (
             <RequirePermission permissions='lti.finance.payments.update'>
               <Button
@@ -164,7 +166,9 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
               </Button>
             </RequirePermission>
           )}
-        {FINANCE_INITIAL_BALANCE_STATUS.includes(finance.transaction_type) && (
+        {FINANCE_INITIAL_BALANCE_STATUS.includes(
+          finance.transaction_type || ''
+        ) && (
           <RequirePermission permissions='lti.finance.initial_balances.update'>
             <Button
               color='warning'
@@ -176,7 +180,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
             </Button>
           </RequirePermission>
         )}
-        {FINANCE_INJECTION_STATUS.includes(finance.transaction_type) && (
+        {FINANCE_INJECTION_STATUS.includes(finance.transaction_type || '') && (
           <RequirePermission permissions='lti.finance.injections.update'>
             <Button
               color='warning'
@@ -202,7 +206,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
-        text={`Apakah anda yakin ingin menghapus data Finance ini (${finance?.payment_code})?`}
+        text={`Apakah anda yakin ingin menghapus data Finance ini (${finance?.payment_code || ''})?`}
         secondaryButton={{
           text: 'Tidak',
         }}