diff --git a/frappe/public/js/frappe/form/controls/currency.js b/frappe/public/js/frappe/form/controls/currency.js
index 5a50ad9de6..f6a7b566d6 100644
--- a/frappe/public/js/frappe/form/controls/currency.js
+++ b/frappe/public/js/frappe/form/controls/currency.js
@@ -1,7 +1,7 @@
 frappe.ui.form.ControlCurrency = frappe.ui.form.ControlFloat.extend({
 	format_for_input: function(value) {
 		var formatted_value = format_number(value, this.get_number_format(), this.get_precision());
-		return isNaN(parseFloat(value)) ? "" : formatted_value;
+		return isNaN(Number(value)) ? "" : formatted_value;
 	},
 
 	get_precision: function() {
diff --git a/frappe/public/js/frappe/form/controls/float.js b/frappe/public/js/frappe/form/controls/float.js
index 027cfebc2a..306c05dc1b 100644
--- a/frappe/public/js/frappe/form/controls/float.js
+++ b/frappe/public/js/frappe/form/controls/float.js
@@ -10,7 +10,7 @@ frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({
 			number_format = this.get_number_format();
 		}
 		var formatted_value = format_number(value, number_format, this.get_precision());
-		return isNaN(parseFloat(value)) ? "" : formatted_value;
+		return isNaN(Number(value)) ? "" : formatted_value;
 	},
 
 	get_number_format: function() {