diff --git a/lib/redux/credit/credit_selectors.dart b/lib/redux/credit/credit_selectors.dart
index 3f31b6ea2..6e478e01a 100644
--- a/lib/redux/credit/credit_selectors.dart
+++ b/lib/redux/credit/credit_selectors.dart
@@ -113,13 +113,21 @@ List<String> filteredCreditsSelector(
         !client.matchesFilter(creditListState.filter)) {
       return false;
     }
+
     if (creditListState.custom1Filters.isNotEmpty &&
         !creditListState.custom1Filters.contains(credit.customValue1)) {
       return false;
     } else if (creditListState.custom2Filters.isNotEmpty &&
         !creditListState.custom2Filters.contains(credit.customValue2)) {
       return false;
+    } else if (creditListState.custom3Filters.isNotEmpty &&
+        !creditListState.custom3Filters.contains(credit.customValue3)) {
+      return false;
+    } else if (creditListState.custom4Filters.isNotEmpty &&
+        !creditListState.custom4Filters.contains(credit.customValue4)) {
+      return false;
     }
+
     return true;
   }).toList();
 
diff --git a/lib/redux/expense/expense_selectors.dart b/lib/redux/expense/expense_selectors.dart
index e6a901f97..750d365e9 100644
--- a/lib/redux/expense/expense_selectors.dart
+++ b/lib/redux/expense/expense_selectors.dart
@@ -167,11 +167,17 @@ List<String> filteredExpensesSelector(
     if (expenseListState.custom1Filters.isNotEmpty &&
         !expenseListState.custom1Filters.contains(expense.customValue1)) {
       return false;
-    }
-    if (expenseListState.custom2Filters.isNotEmpty &&
+    } else if (expenseListState.custom2Filters.isNotEmpty &&
         !expenseListState.custom2Filters.contains(expense.customValue2)) {
       return false;
+    } else if (expenseListState.custom3Filters.isNotEmpty &&
+        !expenseListState.custom3Filters.contains(expense.customValue3)) {
+      return false;
+    } else if (expenseListState.custom4Filters.isNotEmpty &&
+        !expenseListState.custom4Filters.contains(expense.customValue4)) {
+      return false;
     }
+
     return expense.matchesFilter(expenseListState.filter);
   }).toList();
 
diff --git a/lib/redux/invoice/invoice_selectors.dart b/lib/redux/invoice/invoice_selectors.dart
index 484771574..f623e389c 100644
--- a/lib/redux/invoice/invoice_selectors.dart
+++ b/lib/redux/invoice/invoice_selectors.dart
@@ -149,16 +149,13 @@ List<String> filteredInvoicesSelector(
     if (invoiceListState.custom1Filters.isNotEmpty &&
         !invoiceListState.custom1Filters.contains(invoice.customValue1)) {
       return false;
-    }
-    if (invoiceListState.custom2Filters.isNotEmpty &&
+    } else if (invoiceListState.custom2Filters.isNotEmpty &&
         !invoiceListState.custom2Filters.contains(invoice.customValue2)) {
       return false;
-    }
-    if (invoiceListState.custom3Filters.isNotEmpty &&
+    } else if (invoiceListState.custom3Filters.isNotEmpty &&
         !invoiceListState.custom3Filters.contains(invoice.customValue3)) {
       return false;
-    }
-    if (invoiceListState.custom4Filters.isNotEmpty &&
+    } else if (invoiceListState.custom4Filters.isNotEmpty &&
         !invoiceListState.custom4Filters.contains(invoice.customValue4)) {
       return false;
     }
diff --git a/lib/ui/expense/view/expense_view_overview.dart b/lib/ui/expense/view/expense_view_overview.dart
index 6331f9aef..b8ae8305c 100644
--- a/lib/ui/expense/view/expense_view_overview.dart
+++ b/lib/ui/expense/view/expense_view_overview.dart
@@ -42,7 +42,6 @@ class ExpenseOverview extends StatelessWidget {
           field: CustomFieldType.expense1,
           value: expense.customValue1);
     }
-
     if (expense.customValue2.isNotEmpty) {
       final label2 = company.getCustomFieldLabel(CustomFieldType.expense2);
       fields[label2] = formatCustomValue(
@@ -50,6 +49,20 @@ class ExpenseOverview extends StatelessWidget {
           field: CustomFieldType.expense2,
           value: expense.customValue2);
     }
+    if (expense.customValue3.isNotEmpty) {
+      final label3 = company.getCustomFieldLabel(CustomFieldType.expense3);
+      fields[label3] = formatCustomValue(
+          context: context,
+          field: CustomFieldType.expense3,
+          value: expense.customValue3);
+    }
+    if (expense.customValue4.isNotEmpty) {
+      final label4 = company.getCustomFieldLabel(CustomFieldType.expense4);
+      fields[label4] = formatCustomValue(
+          context: context,
+          field: CustomFieldType.expense4,
+          value: expense.customValue4);
+    }
 
     List<Widget> _buildDetailsList() {
       String tax = '';