diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart
index ed428c9f8..bfd5fea69 100644
--- a/lib/data/models/expense_model.dart
+++ b/lib/data/models/expense_model.dart
@@ -124,6 +124,7 @@ abstract class ExpenseEntity extends Object
       taxAmount2: 0,
       taxAmount3: 0,
       usesInclusiveTaxes: company?.expenseInclusiveTaxes ?? false,
+      calculateTaxByAmount: company?.calculateExpenseTaxByAmount ?? false,
       clientId: client?.id,
       vendorId: vendor?.id,
       invoiceId: '',
@@ -554,7 +555,7 @@ abstract class ExpenseEntity extends Object
   double get taxAmount {
     var total = 0.0;
 
-    if (taxAmount1 != 0 || taxAmount2 != 0 || taxAmount3 != 0) {
+    if (calculateTaxByAmount == true) {
       total += taxAmount1 + taxAmount2 + taxAmount3;
     } else {
       if (usesInclusiveTaxes) {
diff --git a/lib/ui/expense/edit/expense_edit_details.dart b/lib/ui/expense/edit/expense_edit_details.dart
index e0844a7c1..219ef167c 100644
--- a/lib/ui/expense/edit/expense_edit_details.dart
+++ b/lib/ui/expense/edit/expense_edit_details.dart
@@ -198,7 +198,7 @@ class ExpenseEditDetailsState extends State<ExpenseEditDetails> {
             ),
             if (!expense.usesInclusiveTaxes) amountField,
             if (company.enableFirstItemTaxRate)
-              if (company.calculateExpenseTaxByAmount)
+              if (expense.calculateTaxByAmount == true)
                 TaxRateField(
                   initialTaxAmount: expense.taxAmount1,
                   initialTaxName: expense.taxName1,
@@ -218,7 +218,7 @@ class ExpenseEditDetailsState extends State<ExpenseEditDetails> {
                   initialTaxRate: expense.taxRate1,
                 ),
             if (company.enableSecondItemTaxRate)
-              if (company.calculateExpenseTaxByAmount)
+              if (expense.calculateTaxByAmount == true)
                 TaxRateField(
                   initialTaxAmount: expense.taxAmount2,
                   initialTaxName: expense.taxName2,
@@ -238,7 +238,7 @@ class ExpenseEditDetailsState extends State<ExpenseEditDetails> {
                   initialTaxRate: expense.taxRate3,
                 ),
             if (company.enableThirdItemTaxRate)
-              if (company.calculateExpenseTaxByAmount)
+              if (expense.calculateTaxByAmount == true)
                 TaxRateField(
                   initialTaxAmount: expense.taxAmount1,
                   initialTaxName: expense.taxName1,
diff --git a/lib/ui/expense/edit/expense_edit_settings.dart b/lib/ui/expense/edit/expense_edit_settings.dart
index fe9df8b37..53d72c813 100644
--- a/lib/ui/expense/edit/expense_edit_settings.dart
+++ b/lib/ui/expense/edit/expense_edit_settings.dart
@@ -240,16 +240,14 @@ class ExpenseEditSettingsState extends State<ExpenseEditSettings> {
         if (company.numberOfItemTaxRates > 0)
           FormCard(
             children: [
-              /*
               BoolDropdownButton(
                 label: localization.enterTaxes,
                 enabledLabel: localization.byAmount,
                 disabledLabel: localization.byRate,
-                value: false,
-                onChanged: (value) => viewModel.onChanged(expense
-                    .rebuild((b) => b..calculateExpenseTaxByAmount = value)),
+                value: expense.calculateTaxByAmount ?? false,
+                onChanged: (value) => viewModel.onChanged(
+                    expense.rebuild((b) => b..calculateTaxByAmount = value)),
               ),
-              */
               SizedBox(height: 16),
               SwitchListTile(
                 activeColor: Theme.of(context).accentColor,