diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 7a4a0df6b0..ceb993096a 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -236,10 +236,8 @@ class AccountsController(TransactionBase):
 				.format(account, _(" or ").join(valid_currency)))
 
 	def set_balance_in_account_currency(self, gl_dict, account_currency=None):
-		if self.doctype=="Journal Entry":
-			return
-
-		if (not self.get("conversion_rate") and account_currency!=self.company_currency):
+		if (not self.get("conversion_rate") and self.doctype!="Journal Entry"
+			and account_currency!=self.company_currency):
 				frappe.throw(_("Account: {0} with currency: {1} can not be selected")
 					.format(gl_dict.account, account_currency))