diff --git a/resources/scripts/views/estimates/Index.vue b/resources/scripts/views/estimates/Index.vue
index b61d7b90..554ef09e 100644
--- a/resources/scripts/views/estimates/Index.vue
+++ b/resources/scripts/views/estimates/Index.vue
@@ -184,7 +184,7 @@
 
         <!-- Estimate date  -->
         <template #cell-estimate_date="{ row }">
-            {{ row.data.formatted_estimate_date }}
+          {{ row.data.formatted_estimate_date }}
         </template>
 
         <template #cell-estimate_number="{ row }">
@@ -209,7 +209,10 @@
         </template>
 
         <template #cell-total="{ row }">
-          <BaseFormatMoney :amount="row.data.total" />
+          <BaseFormatMoney
+            :amount="row.data.total"
+            :currency="row.data.customer.currency"
+          />
         </template>
 
         <!-- Actions -->
diff --git a/resources/scripts/views/expenses/Index.vue b/resources/scripts/views/expenses/Index.vue
index 4d27a5ac..e28dc741 100644
--- a/resources/scripts/views/expenses/Index.vue
+++ b/resources/scripts/views/expenses/Index.vue
@@ -181,7 +181,7 @@
         <template #cell-amount="{ row }">
           <BaseFormatMoney
             :amount="row.data.amount"
-            :currency="companyStore.selectedCompanyCurrency"
+            :currency="row.data.currency"
           />
         </template>
 
diff --git a/resources/scripts/views/invoices/Index.vue b/resources/scripts/views/invoices/Index.vue
index b8aae418..425e60bc 100644
--- a/resources/scripts/views/invoices/Index.vue
+++ b/resources/scripts/views/invoices/Index.vue
@@ -194,7 +194,7 @@
 
         <!-- Invoice date  -->
         <template #cell-invoice_date="{ row }">
-            {{ row.data.formatted_invoice_date }}
+          {{ row.data.formatted_invoice_date }}
         </template>
 
         <!-- Invoice Total  -->
diff --git a/resources/scripts/views/payments/Index.vue b/resources/scripts/views/payments/Index.vue
index 906d44a3..363c5400 100644
--- a/resources/scripts/views/payments/Index.vue
+++ b/resources/scripts/views/payments/Index.vue
@@ -185,7 +185,7 @@
         <template #cell-amount="{ row }">
           <BaseFormatMoney
             :amount="row.data.amount"
-            :currency="companyStore.selectedCompanyCurrency"
+            :currency="row.data.customer.currency"
           />
         </template>