diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 74934925da28..93a55c6adf6f 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -35,6 +35,7 @@ use League\Fractal\Resource\Item;
 use App\Models\BankTransactionRule;
 use Illuminate\Support\Facades\Auth;
 use App\Transformers\ArraySerializer;
+use Illuminate\Support\Facades\Schema as DbSchema;
 use App\Transformers\EntityTransformer;
 use League\Fractal\Resource\Collection;
 use Illuminate\Database\Eloquent\Builder;
@@ -1106,7 +1107,7 @@ class BaseController extends Controller
     public function flutterRoute()
     {
 
-        if ((bool) $this->checkAppSetup() !== false && $account = Account::first()) {
+        if ((bool) $this->checkAppSetup() !== false && DbSchema::hasTable('accounts') && $account = Account::first()) {
 
             /** @var \App\Models\Account $account */
 
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index c415d36903d4..e24190fdd341 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -83,6 +83,7 @@ class SystemHealth
             'pdf_engine' => (string) self::getPdfEngine(),
             'queue' => (string) config('queue.default'),
             'queue_data' => self::checkQueueData(),
+            'jobs_pending' => 0, // TODO for backwards compatibility, remove once Flutter AP is updated
             'trailing_slash' => (bool) self::checkUrlState(),
             'file_permissions' => (string) ($check_file_system ? self::checkFileSystem() : ''),
             'exchange_rate_api_not_configured' => (bool)self::checkCurrencySanity(),