diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php
index 859f04ec057d..ff0c0abd0889 100644
--- a/app/Listeners/Activity/PaymentCreatedActivity.php
+++ b/app/Listeners/Activity/PaymentCreatedActivity.php
@@ -38,19 +38,18 @@ class PaymentCreatedActivity implements ShouldQueue
      * @return void
      */
     public function handle($event)
-    {
+    {   
+
         MultiDB::setDb($event->company->db);
 
         $payment = $event->payment;
         $invoice_id = null;
 
         if($payment->invoices()->exists())
-            $invoice_id = $payment->invoices->first()->id;
+            $invoice_id = $payment->invoices()->first()->id;
 
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
-        $invoices = $payment->invoices;
-
         $fields = new stdClass;
 
         $fields->payment_id = $payment->id;
@@ -60,8 +59,7 @@ class PaymentCreatedActivity implements ShouldQueue
         $fields->company_id = $payment->company_id;
         $fields->activity_type_id = Activity::CREATE_PAYMENT;
 
-        if (count($invoices) == 0) {
-            $this->activity_repo->save($fields, $payment, $event->event_vars);
-        }
+        $this->activity_repo->save($fields, $payment, $event->event_vars);
+
     }
 }
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index 0b4be3c46880..073f04fd7cec 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -185,7 +185,7 @@ class PaymentRepository extends BaseRepository
                     $paymentable->payment_id = $payment->id;
                     $paymentable->paymentable_id = $credit->id;
                     $paymentable->paymentable_type = Credit::class;
-                    $paymentable->amount = $paid_invoice['amount'];
+                    $paymentable->amount = $paid_credit['amount'];
                     $paymentable->save();
 
                     $credit = $credit->service()->markSent()->save();