diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index c07103a3d4e4..3ee5de03ced7 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -386,11 +386,6 @@
             self.convert_currency = ko.observable({{ ($expense && $expense->isExchanged()) ? 'true' : 'false' }});
             self.apply_taxes = ko.observable({{ ($expense && ($expense->tax_name1 || $expense->tax_name2)) ? 'true' : 'false' }});
 
-            self.account_currency_id = ko.observable({{ $account->getCurrencyId() }});
-            self.client_id = ko.observable({{ $clientPublicId }});
-            self.vendor_id = ko.observable({{ $vendorPublicId }});
-            self.expense_category_id = ko.observable({{ $categoryPublicId }});
-
             self.mapping = {
                 'documents': {
                     create: function(options) {
@@ -403,6 +398,11 @@
                 ko.mapping.fromJS(data, self.mapping, this);
             }
 
+            self.account_currency_id = ko.observable({{ $account->getCurrencyId() }});
+            self.client_id = ko.observable({{ $clientPublicId }});
+            self.vendor_id = ko.observable({{ $vendorPublicId }});
+            self.expense_category_id = ko.observable({{ $categoryPublicId }});
+
             self.convertedAmount = ko.computed({
                 read: function () {
                     return roundToTwo(self.amount() * self.exchange_rate()).toFixed(2);