diff --git a/app/Http/Controllers/Bank/NordigenController.php b/app/Http/Controllers/Bank/NordigenController.php
index 98a5f69919f0..c65693c8254c 100644
--- a/app/Http/Controllers/Bank/NordigenController.php
+++ b/app/Http/Controllers/Bank/NordigenController.php
@@ -154,7 +154,7 @@ class NordigenController extends BaseController
             return response()->redirectTo(($context && array_key_exists("redirect", $context) ? $context["redirect"] : config('ninja.app_url')) . "?action=nordigen_connect&status=failed&reason=ref-invalid");
 
 
-        $company = Company::where('company_key', $context["company_key"])->first();
+        $company = Company::where('company_key', $context["company_key"])->firstOrFail();
         $account = $company->account;
 
         if (!(($account->bank_integration_nordigen_secret_id && $account->bank_integration_nordigen_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key'))))
diff --git a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php
index 42c196937b33..6ba21e3bbc04 100644
--- a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php
+++ b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php
@@ -30,8 +30,9 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     private Account $account;
-
     private BankIntegration $bank_integration;
+    private string $secret_id;
+    private string $secret_key;
 
     private ?string $from_date;
 
@@ -56,10 +57,18 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
         if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_NORDIGEN)
             throw new \Exception("Invalid BankIntegration Type");
 
-        if (!(($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key'))))
+        if (!(($this->account->bank_integration_secret_id && $this->account->integration_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key'))))
             throw new \Exception("Missing credentials for bank_integration service nortigen");
 
-        $this->nordigen = ($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) ? new Nordigen($this->account->bank_integration_nordigen_secret_id, $this->account->bank_integration_nordigen_secret_key) : new Nordigen(config('ninja.nordigen.secret_id'), config('ninja.nordigen.secret_key'));
+        if ($this->account->bank_integration_secret_id && $this->account->bank_integration_secret_key) {
+            $this->secret_id = $this->account->bank_integration_secret_id;
+            $this->secret_key = $this->account->bank_integration_secret_key;
+        } else {
+            $this->secret_id = config('ninja.nordigen.secret_id');
+            $this->secret_key = config('ninja.nordigen.secret_key');
+        }
+
+        $this->nordigen = new Nordigen($this->secret_id, $this->secret_key);
     }
 
     /**
@@ -80,8 +89,7 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
         try {
             $this->updateAccount();
         } catch (\Exception $e) {
-            $secretId = $this->account->bank_integration_nordigen_secret_id ?: config('ninja.nortigen.secret_id');
-            nlog("{$secretId} - exited abnormally => " . $e->getMessage());
+            nlog("{$this->secret_id} - exited abnormally => " . $e->getMessage());
 
             $content = [
                 "Processing transactions for account: {$this->bank_integration->account->key} failed",
@@ -101,8 +109,7 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
             try {
                 $this->processTransactions();
             } catch (\Exception $e) {
-                $secretId = $this->account->bank_integration_nordigen_secret_id ?: config('ninja.nortigen.secret_id');
-                nlog("{$secretId} - exited abnormally => " . $e->getMessage());
+                nlog("{$this->secret_id} - exited abnormally => " . $e->getMessage());
 
                 $content = [
                     "Processing transactions for account: {$this->bank_integration->account->key} failed",
diff --git a/app/Jobs/Bank/ProcessBankTransactionsYodlee.php b/app/Jobs/Bank/ProcessBankTransactionsYodlee.php
index ac30579f6a95..1e74c95533c9 100644
--- a/app/Jobs/Bank/ProcessBankTransactionsYodlee.php
+++ b/app/Jobs/Bank/ProcessBankTransactionsYodlee.php
@@ -11,7 +11,6 @@
 
 namespace App\Jobs\Bank;
 
-use App\Helpers\Bank\Yodlee\Nordigen;
 use App\Helpers\Bank\Yodlee\Transformer\AccountTransformer;
 use App\Helpers\Bank\Yodlee\Yodlee;
 use App\Libraries\MultiDB;