diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart
index ef3f0ec29..344188a37 100644
--- a/lib/data/models/entities.dart
+++ b/lib/data/models/entities.dart
@@ -89,12 +89,12 @@ class EntityType extends EnumClass {
       case EntityType.client:
         return [
           EntityType.invoice,
+          EntityType.task,
+          EntityType.expense,
           EntityType.payment,
           EntityType.quote,
           EntityType.credit,
           EntityType.project,
-          EntityType.task,
-          EntityType.expense,
           EntityType.recurringInvoice,
           EntityType.recurringExpense,
         ];
diff --git a/lib/ui/client/view/client_view_overview.dart b/lib/ui/client/view/client_view_overview.dart
index 85936e4bf..5383f5abc 100644
--- a/lib/ui/client/view/client_view_overview.dart
+++ b/lib/ui/client/view/client_view_overview.dart
@@ -178,16 +178,25 @@ class ClientOverview extends StatelessWidget {
                 memoizedInvoiceStatsForClient(client.id, state.invoiceState.map)
                     .present(localization.active, localization.archived),
           ),
-        if (company.isModuleEnabled(EntityType.recurringInvoice))
+        if (company.isModuleEnabled(EntityType.task))
           EntitiesListTile(
             entity: client,
             isFilter: isFilter,
-            entityType: EntityType.recurringInvoice,
-            title: localization.recurringInvoices,
-            subtitle: memoizedRecurringInvoiceStatsForClient(
-                    client.id, state.recurringInvoiceState.map)
+            entityType: EntityType.task,
+            title: localization.tasks,
+            subtitle: memoizedTaskStatsForClient(client.id, state.taskState.map)
                 .present(localization.active, localization.archived),
           ),
+        if (company.isModuleEnabled(EntityType.expense))
+          EntitiesListTile(
+            entity: client,
+            isFilter: isFilter,
+            entityType: EntityType.expense,
+            title: localization.expenses,
+            subtitle:
+                memoizedExpenseStatsForClient(client.id, state.expenseState.map)
+                    .present(localization.active, localization.archived),
+          ),
         if (company.isModuleEnabled(EntityType.payment))
           EntitiesListTile(
             entity: client,
@@ -228,25 +237,16 @@ class ClientOverview extends StatelessWidget {
                 memoizedProjectStatsForClient(client.id, state.projectState.map)
                     .present(localization.active, localization.archived),
           ),
-        if (company.isModuleEnabled(EntityType.task))
+        if (company.isModuleEnabled(EntityType.recurringInvoice))
           EntitiesListTile(
             entity: client,
             isFilter: isFilter,
-            entityType: EntityType.task,
-            title: localization.tasks,
-            subtitle: memoizedTaskStatsForClient(client.id, state.taskState.map)
+            entityType: EntityType.recurringInvoice,
+            title: localization.recurringInvoices,
+            subtitle: memoizedRecurringInvoiceStatsForClient(
+                    client.id, state.recurringInvoiceState.map)
                 .present(localization.active, localization.archived),
           ),
-        if (company.isModuleEnabled(EntityType.expense))
-          EntitiesListTile(
-            entity: client,
-            isFilter: isFilter,
-            entityType: EntityType.expense,
-            title: localization.expenses,
-            subtitle:
-                memoizedExpenseStatsForClient(client.id, state.expenseState.map)
-                    .present(localization.active, localization.archived),
-          ),
         if (company.isModuleEnabled(EntityType.recurringExpense))
           EntitiesListTile(
             entity: client,