diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index d83a2630b11e..726cea8f92f2 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -298721,7 +298721,7 @@
           else if (B.JSArray_methods.contains$1(A._setArrayType([B.EntityType_recurringExpense], t2), t3) && B.JSArray_methods.contains$1(A._setArrayType(["-1", "2"], type$.JSArray_legacy_String), _this.get$calculatedStatusId()))
             actions.push(B.EntityAction_stop);
         t4 = _this.invoiceId;
-        if (!(t4 != null && t4.length !== 0) && !B.JSArray_methods.contains$1(A._setArrayType([B.EntityType_recurringExpense], t2), t3) && userCompany.can$2(B.UserPermission_create, B.EntityType_invoice))
+        if (!(t4 != null && t4.length !== 0) && !B.JSArray_methods.contains$1(A._setArrayType([B.EntityType_recurringExpense], t2), t3) && _this.shouldBeInvoiced && userCompany.can$2(B.UserPermission_create, B.EntityType_invoice))
           actions.push(B.EntityAction_invoiceExpense);
       }
       if (!multiselect && !_this.get$isNew()) {
@@ -345750,7 +345750,7 @@
         return false;
       if (!expense.get$isArchived() && !expense.isDeleted) {
         t1 = expense.invoiceId;
-        t1 = !(t1 != null && t1.length !== 0);
+        t1 = !(t1 != null && t1.length !== 0) && expense.shouldBeInvoiced;
       } else
         t1 = false;
       return t1;
@@ -380442,10 +380442,9 @@
       new A.WebClient().$get$2(0, credentials.url + "/ping?clear_cache=true", credentials.token).then$1$1(0, new A._HealthCheckDialogState_clearCache_closure0(_this, store), type$.Null).catchError$1(new A._HealthCheckDialogState_clearCache_closure1(_this));
     },
     build$1(_, context) {
-      var webPhpVersion, cliPhpVersion, t3, t4, t5, t6, t7, _this = this, _null = null,
+      var webPhpVersion, cliPhpVersion, t3, t4, t5, t6, _this = this, _null = null,
         _s14_ = "(\\d+\\.\\d+.\\d+)",
         t1 = A.Localizations_of(context, B.Type_AppLocalization_KyD, type$.legacy_AppLocalization),
-        state = A._lateReadCheck(A.StoreProvider_of(context, type$.legacy_AppState).__Store__state, "_state"),
         t2 = _this._response;
       t2 = t2 == null ? _null : t2.phpVersion;
       t2 = t2 == null ? _null : t2.currentPHPVersion;
@@ -380468,21 +380467,10 @@
         t5 = t3.dbCheck;
         t3 = t3.phpVersion;
         t6 = webPhpVersion == cliPhpVersion ? "v" + A.S(webPhpVersion) : "Web: v" + A.S(webPhpVersion) + "\nCLI: v" + A.S(cliPhpVersion);
-        t7 = type$.JSArray_legacy_Widget;
-        t6 = A._setArrayType([new A._HealthListTile("System Health", t4, false, t2, _null, _null), new A._HealthListTile("Database Check", t5, false, _null, _null, _null), new A._HealthListTile("PHP Version", t3.isOkay, false, t6, _null, _null)], t7);
+        t6 = A._setArrayType([new A._HealthListTile("System Health", t4, false, t2, _null, _null), new A._HealthListTile("Database Check", t5, false, _null, _null, _null), new A._HealthListTile("PHP Version", t3.isOkay, false, t6, _null, _null)], type$.JSArray_legacy_Widget);
         t2 = _this._response.filePermissions;
         if (t2 !== "Ok")
           t6.push(new A._HealthListTile("Invalid File Permissions", false, false, t2, "https://invoiceninja.github.io/docs/self-host-installation/#file-permissions", _null));
-        t2 = state.userCompanyStates;
-        t3 = state.uiState.selectedCompanyIndex;
-        if (!t2._list[t3].userCompany.account.isDocker) {
-          t2 = A._setArrayType([], t7);
-          t3 = _this._response;
-          if (!t3.openBasedir)
-            if (!t3.cacheEnabled)
-              t2.push(new A._HealthListTile("Config not cached", true, true, "Run php artisan optimize to improve performance", _null, _null));
-          B.JSArray_methods.addAll$1(t6, t2);
-        }
         if (_this._response.queue === "sync")
           t6.push(new A._HealthListTile("Queue not enabled", true, true, "Enable the queue for improved performance", "https://invoiceninja.github.io/docs/self-host-installation/#final-setup-steps", _null));
         if (_this._response.phantomEnabled)