diff --git a/frappe/public/js/frappe/form/controls/currency.js b/frappe/public/js/frappe/form/controls/currency.js
index 5f893c9495..e831bcfc0c 100644
--- a/frappe/public/js/frappe/form/controls/currency.js
+++ b/frappe/public/js/frappe/form/controls/currency.js
@@ -1,5 +1,10 @@
 frappe.ui.form.ControlCurrency = frappe.ui.form.ControlFloat.extend({
 	eval_expression: function(value) {
+		if (typeof value === 'string' && value.includes(',')
+			&& frappe.sys_defaults.number_format.startsWith("#.")) {
+			return value;
+		}
+
 		if (typeof value === 'string' 
 			&& value.match(/^[0-9+-/* ]+$/)) {
 			if (value.includes(',')) {