diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart
index 04924149518..c87a010901e 100644
--- a/lib/data/models/expense_model.dart
+++ b/lib/data/models/expense_model.dart
@@ -349,6 +349,7 @@ abstract class ExpenseEntity extends Object
 
       if (!isInvoiced &&
           !isRecurring &&
+          shouldBeInvoiced &&
           userCompany.canCreate(EntityType.invoice)) {
         actions.add(EntityAction.invoiceExpense);
       }
diff --git a/lib/redux/expense/expense_selectors.dart b/lib/redux/expense/expense_selectors.dart
index 534f18ecd98..874ed45eef4 100644
--- a/lib/redux/expense/expense_selectors.dart
+++ b/lib/redux/expense/expense_selectors.dart
@@ -311,7 +311,7 @@ List<String> clientExpenseList(
         expense.clientId != clientId) {
       return false;
     }
-    return expense.isActive && !expense.isInvoiced;
+    return expense.isActive && !expense.isInvoiced && expense.shouldBeInvoiced;
   }).toList();
 
   list.sort((idA, idB) => expenseMap[idA]
diff --git a/lib/ui/app/dialogs/health_check_dialog.dart b/lib/ui/app/dialogs/health_check_dialog.dart
index 9a80630e9a7..5e004c5bbb6 100644
--- a/lib/ui/app/dialogs/health_check_dialog.dart
+++ b/lib/ui/app/dialogs/health_check_dialog.dart
@@ -90,7 +90,6 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
   @override
   Widget build(BuildContext context) {
     final localization = AppLocalization.of(context);
-    final state = StoreProvider.of<AppState>(context).state;
     final webPhpVersion =
         _parseVersion(_response?.phpVersion?.currentPHPVersion ?? '');
     final cliPhpVersion =
@@ -153,15 +152,14 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
                     url:
                         'https://invoiceninja.github.io/docs/self-host-installation/#file-permissions',
                   ),
+                /*
                 if (!state.account.isDocker) ...[
                   if (!_response.openBasedir)
-                    /*
                     _HealthListTile(
                       title: 'Open Basedir',
                       isWarning: true,
                       subtitle: 'Not enabled',
                     ),
-                    */
                     if (!_response.cacheEnabled)
                       _HealthListTile(
                         title: 'Config not cached',
@@ -170,6 +168,7 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
                         isWarning: true,
                       ),
                 ],
+                */
                 if (_response.queue == 'sync')
                   _HealthListTile(
                     title: 'Queue not enabled',