diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index 7bdb1c2dbdc0..0e42d64f47d4 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -119,6 +119,9 @@ class PaymentController extends Controller
         } else {
             $payment = PaymentFactory::create($payment_hash->fee_invoice->company_id, $payment_hash->fee_invoice->user_id);
             $payment->client_id = $payment_hash->fee_invoice->client_id;
+
+            $payment->saveQuietly();
+            $payment->currency_id = $payment->client->getSetting('currency_id');
             $payment->saveQuietly();
 
             $payment_hash->payment_id = $payment->id;
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index a4a70c834cfe..b66356a42d99 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -106,6 +106,7 @@ class PaymentRepository extends BaseRepository {
         $payment->fill($data);
         $payment->is_manual = true;
         $payment->status_id = Payment::STATUS_COMPLETED;
+
         $payment->save();
 
         /*Save documents*/
@@ -207,6 +208,7 @@ class PaymentRepository extends BaseRepository {
             $payment->exchange_rate = $exchange_rate->exchangeRate($client_currency, $company_currency, Carbon::parse($payment->date));
             // $payment->exchange_currency_id = $client_currency;
             $payment->exchange_currency_id = $company_currency;
+            $payment->currency_id = $client_currency;
 
         }
 
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index 465fd522f524..8bd2e8c891a1 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -119,6 +119,7 @@ class CreditService
         $payment->status_id = Payment::STATUS_COMPLETED;
         $payment->type_id = PaymentType::CREDIT;
         $payment->is_manual = true;
+        $payment->currency_id = $this->credit->client->getSetting('currency_id');
         $payment->date = now();
 
         $payment->saveQuietly();