diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
index 1e7143bc44..d782a7c167 100644
--- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
@@ -92,8 +92,8 @@ class StoreRequest extends FormRequest
             'transactions.*.foreign_currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable',
 
             // amount
-            'transactions.*.amount'                => 'required|numeric|gt:0',
-            'transactions.*.foreign_amount'        => 'numeric',
+            'transactions.*.amount'                => 'required|numeric|gt:0|max:1000000000',
+            'transactions.*.foreign_amount'        => 'numeric|max:1000000000',
 
             // description
             'transactions.*.description'           => 'nullable|between:1,1000',
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index b74b301365..4a46767980 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -88,7 +88,7 @@ class BudgetRepository implements BudgetRepositoryInterface
         $limitRepository = app(BudgetLimitRepository::class);
         $limitRepository->setUser($this->user);
         $budgets         = $this->getActiveBudgets();
-        $defaultCurrency = Amount::getDefaultCurrencyByUser($this->user);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
         $converter       = new ExchangeRateConverter();
 
         /** @var Budget $budget */