diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 2cdd35528c..04eb81d346 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -432,10 +432,9 @@ class DashboardChart {
 			"Pie": 'pie'
 		};
 
-		let chart_type = chart_type_map[this.chart_doc.chart_type];
 		let colors = [];
 
-		if (chart_type in ['Line', 'Bar']) {
+		if (['Line', 'Bar'].includes(this.chart_doc.type)) {
 			colors = [this.chart_doc.color || "light-blue"];
 		}
 
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index d13ade32a7..218ee57883 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -47,6 +47,7 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 		});
 
+		$(frm.get_field('y_field').wrapper).empty();
 		frm.set_df_property("filters_section", "hidden", 1);
 		frm.set_query('document_type', function() {
 			return {
@@ -105,7 +106,6 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_value('x_field', '');
 		frm.set_value('y_field', '[]');
 		frm.set_df_property('x_field', 'options', []);
-		$(frm.get_field('y_field').wrapper).empty();
 		frm.set_value('filters_json', '{}');
 		frm.trigger('set_chart_report_filters');
 	},