diff --git a/lib/ui/app/tables/entity_datatable.dart b/lib/ui/app/tables/entity_datatable.dart
index 9cfa6e36b..1301cd88a 100644
--- a/lib/ui/app/tables/entity_datatable.dart
+++ b/lib/ui/app/tables/entity_datatable.dart
@@ -131,8 +131,8 @@ class DatatableHeader extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final localization = AppLocalization.of(context);
-    final state = StoreProvider.of<AppState>(context).state;
     /*
+    final state = StoreProvider.of<AppState>(context).state;
     final listUIState = state.getListState(entityType);
     Widget message = SizedBox();
     if (onClearPressed != null && listUIState.filterEntityId != null) {
diff --git a/lib/ui/invoice/view/invoice_view_overview.dart b/lib/ui/invoice/view/invoice_view_overview.dart
index c05413ba8..37f888bf3 100644
--- a/lib/ui/invoice/view/invoice_view_overview.dart
+++ b/lib/ui/invoice/view/invoice_view_overview.dart
@@ -57,7 +57,11 @@ class InvoiceOverview extends StatelessWidget {
       EntityHeader(
         entity: invoice,
         statusColor: color,
-        statusLabel: localization.lookup('${invoice.entityType}_status_${invoice.statusId}'),
+        statusLabel: invoice.statusId == kInvoiceStatusDraft
+            ? null
+            : invoice.isPastDue
+                ? localization.pastDue
+                : localization.lookup(stauses[invoice.statusId]),
         label: localization.totalAmount,
         value:
             formatNumber(invoice.amount, context, clientId: invoice.clientId),