diff --git a/frappe/public/js/frappe/misc/number_format.js b/frappe/public/js/frappe/misc/number_format.js
index e26c96cffc..422f613783 100644
--- a/frappe/public/js/frappe/misc/number_format.js
+++ b/frappe/public/js/frappe/misc/number_format.js
@@ -115,7 +115,7 @@ window.format_number = function(v, format, decimals){
 	}
 
 	// join decimal
-	part[1] = part[1] ? (info.decimal_str + part[1]) : "";
+	part[1] = (part[1] && info.decimal_str) ? (info.decimal_str + part[1]) : "";
 
 	// join
 	return (is_negative ? "-" : "") + part[0] + part[1];
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index fd0b583392..f9d81e99e4 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -382,7 +382,7 @@ def fmt_money(amount, precision=None, currency=None):
 
 	parts.reverse()
 
-	amount = comma_str.join(parts) + (precision and (decimal_str + decimals) or "")
+	amount = comma_str.join(parts) + ((precision and decimal_str) and (decimal_str + decimals) or "")
 	amount = minus + amount
 
 	if currency: