diff --git a/app/Handlers/Events/ConnectJournalToPiggyBank.php b/app/Handlers/Events/ConnectJournalToPiggyBank.php
index 7280ccc3c6..81152e3d97 100644
--- a/app/Handlers/Events/ConnectJournalToPiggyBank.php
+++ b/app/Handlers/Events/ConnectJournalToPiggyBank.php
@@ -51,14 +51,7 @@ class ConnectJournalToPiggyBank
             return;
         }
         Log::debug('Found a piggy bank');
-        $amount = 0;
-        /** @var Transaction $transaction */
-        foreach ($journal->transactions()->get() as $transaction) {
-            if ($transaction->account_id === $piggyBank->account_id) {
-                // this transaction is the relevant one.
-                $amount = floatval($transaction->amount);
-            }
-        }
+        $amount = $journal->amount;
         Log::debug('Amount: ' . $amount);
         if ($amount == 0) {
             return;
diff --git a/app/Handlers/Events/UpdateJournalConnection.php b/app/Handlers/Events/UpdateJournalConnection.php
index 38b7a503e7..ad79e70551 100644
--- a/app/Handlers/Events/UpdateJournalConnection.php
+++ b/app/Handlers/Events/UpdateJournalConnection.php
@@ -45,17 +45,8 @@ class UpdateJournalConnection
         if (is_null($repetition)) {
             return;
         }
-        $amount = 0;
-        /** @var Transaction $transaction */
-        foreach ($journal->transactions()->get() as $transaction) {
-            if ($transaction->account_id === $piggyBank->account_id) {
-                // this transaction is the relevant one.
-                $amount = floatval($transaction->amount);
-            }
-        }
-
-        // update current repetition:
-        $diff = $amount - $event->amount;
+        $amount = $journal->amount;
+        $diff   = $amount - $event->amount;// update current repetition
 
         $repetition->currentamount += $diff;
         $repetition->save();
diff --git a/app/Http/Controllers/RelatedController.php b/app/Http/Controllers/RelatedController.php
index 5bdebaae3a..d8d914a3ec 100644
--- a/app/Http/Controllers/RelatedController.php
+++ b/app/Http/Controllers/RelatedController.php
@@ -40,19 +40,7 @@ class RelatedController extends Controller
         $unique   = array_unique($ids);
         $journals = new Collection;
         if (count($unique) > 0) {
-
             $journals = Auth::user()->transactionjournals()->whereIn('id', $unique)->get();
-            $journals->each(
-                function (TransactionJournal $journal) {
-                    /** @var Transaction $t */
-                    foreach ($journal->transactions()->get() as $t) {
-                        if ($t->amount > 0) {
-                            $journal->amount = $t->amount;
-                        }
-                    }
-
-                }
-            );
         }
         $parent = $journal;
 
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 4d850ef7bb..5a3bbfa628 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -149,13 +149,7 @@ class TransactionController extends Controller
             $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id;
         }
 
-        $preFilled['amount'] = 0;
-        /** @var Transaction $t */
-        foreach ($transactions as $t) {
-            if (floatval($t->amount) > 0) {
-                $preFilled['amount'] = floatval($t->amount);
-            }
-        }
+        $preFilled['amount']          = $journal->amount;
         $preFilled['account_id']      = $repository->getAssetAccount($journal);
         $preFilled['expense_account'] = $transactions[0]->account->name;
         $preFilled['revenue_account'] = $transactions[1]->account->name;