diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 04a20db7f5..2f2d480b73 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -177,11 +177,11 @@ class ReportController extends Controller
             /** @var TransactionJournal $journal */
             foreach ($journals as $journal) {
                 $journal->before   = $startBalance;
-                $transactionAmount = TransactionJournal::amount($journal);
+                $transactionAmount = $journal->source_amount;
 
                 // get currently relevant transaction:
                 if (intval($journal->destination_account_id) === $account->id) {
-                    $transactionAmount = TransactionJournal::amountPositive($journal);
+                    $transactionAmount = $journal->destination_amount;
                 }
                 $newBalance     = bcadd($startBalance, $transactionAmount);
                 $journal->after = $newBalance;
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index ae2a388eb0..4e9b33f609 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -419,7 +419,9 @@ class AccountRepository implements AccountRepositoryInterface
         // that should do it:
         $fields   = TransactionJournal::queryFields();
         $fields[] = 'source.account_id as source_account_id';
+        $fields[] = 'source.amount as source_amount';
         $fields[] = 'destination.account_id as destination_account_id';
+        $fields[] = 'destination.amount as destination_amount';
         $complete = $query->get($fields);
 
         return $complete;