diff --git a/app/Jobs/Ninja/BankTransactionSync.php b/app/Jobs/Ninja/BankTransactionSync.php
index ae963b4c1785..e951b3fc363c 100644
--- a/app/Jobs/Ninja/BankTransactionSync.php
+++ b/app/Jobs/Ninja/BankTransactionSync.php
@@ -70,7 +70,7 @@ class BankTransactionSync implements ShouldQueue
             Account::with('bank_integrations')->whereNotNull('bank_integration_account_id')->cursor()->each(function ($account) {
 
                 if ($account->isEnterprisePaidClient()) {
-                    $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_YODLEE)->where('auto_sync', true)->cursor()->each(function ($bank_integration) use ($account) {
+                    $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_YODLEE)->where('auto_sync', true)->where('disabled_upstream', 0)->cursor()->each(function ($bank_integration) use ($account) {
                         (new ProcessBankTransactionsYodlee($account->id, $bank_integration))->handle();
                     });
                 }
@@ -86,7 +86,7 @@ class BankTransactionSync implements ShouldQueue
             Account::with('bank_integrations')->cursor()->each(function ($account) {
 
                 if ((Ninja::isSelfHost() || (Ninja::isHosted() && $account->isEnterprisePaidClient()))) {
-                    $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->cursor()->each(function ($bank_integration) {
+                    $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->where('disabled_upstream', 0)->cursor()->each(function ($bank_integration) {
                         (new ProcessBankTransactionsNordigen($bank_integration))->handle();
                     });
                 }
diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php
index 15797cff2f01..4e38ee26a385 100644
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -91,8 +91,8 @@ class AccountTransformer extends EntityTransformer
             'trial_days_left' => Ninja::isHosted() ? (int) $account->getTrialDays() : 0,
             'account_sms_verified' => (bool) $account->account_sms_verified,
             'has_iap_plan' => (bool)$account->inapp_transaction_id,
-            'tax_api_enabled' => (bool) config('services.tax.zip_tax.key') ? true : false
-
+            'tax_api_enabled' => (bool) config('services.tax.zip_tax.key') ? true : false,
+            'nordigen_enabled' => (bool) (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key')) ? true : false
         ];
     }
 
diff --git a/database/migrations/2024_01_10_155555_add_bank_transaction_nordigen_field.php b/database/migrations/2024_01_10_155555_add_bank_transaction_nordigen_field.php
index fca0b6307f98..0d67430d71a3 100644
--- a/database/migrations/2024_01_10_155555_add_bank_transaction_nordigen_field.php
+++ b/database/migrations/2024_01_10_155555_add_bank_transaction_nordigen_field.php
@@ -1,12 +1,13 @@
 <?php
 
+use App\Utils\Ninja;
 use App\Models\Account;
 use App\Models\BankIntegration;
 use App\Models\BankTransaction;
-use App\Repositories\BankTransactionRepository;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use App\Repositories\BankTransactionRepository;
 
 return new class extends Migration {
     /**
@@ -22,19 +23,22 @@ return new class extends Migration {
             $table->text('nordigen_transaction_id')->nullable();
         });
 
-        // remove invalid transactions
-        BankIntegration::query()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->cursor()->each(function ($bank_integration) {
-            $bank_integration->from_date = now()->subDays(90);
-            $bank_integration->save();
+        if(Ninja::isSelfHost())
+        {
+            // remove invalid transactions
+            BankIntegration::query()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->cursor()->each(function ($bank_integration) {
+                $bank_integration->from_date = now()->subDays(90);
+                $bank_integration->save();
 
-            BankTransaction::query()->where('bank_integration_id', $bank_integration->id)->cursor()->each(function ($bank_transaction) {
-                if ($bank_transaction->invoiceIds != '' || $bank_transaction->expense_id != '')
-                    return;
+                BankTransaction::query()->where('bank_integration_id', $bank_integration->id)->cursor()->each(function ($bank_transaction) {
+                    if ($bank_transaction->invoiceIds != '' || $bank_transaction->expense_id != '')
+                        return;
 
-                $btrepo = new BankTransactionRepository();
-                $btrepo->delete($bank_transaction);
+                    $btrepo = new BankTransactionRepository();
+                    $btrepo->delete($bank_transaction);
+                });
             });
-        });
+        }
     }
 
     /**