diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.js b/frappe/email/doctype/auto_email_report/auto_email_report.js
index fd9170366e..1b91e7a38c 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.js
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.js
@@ -3,23 +3,7 @@
 
 frappe.ui.form.on('Auto Email Report', {
 	refresh: function(frm) {
-		if(frm.doc.report_type !== 'Report Builder') {
-			if(frm.script_setup_for !== frm.doc.report && !frm.doc.__islocal) {
-				frappe.call({
-					method:"frappe.desk.query_report.get_script",
-					args: {
-						report_name: frm.doc.report
-					},
-					callback: function(r) {
-						frappe.dom.eval(r.message.script || "");
-						frm.script_setup_for = frm.doc.report;
-						frm.trigger('show_filters');
-					}
-				});
-			} else {
-				frm.trigger('show_filters');
-			}
-		}
+		frm.trigger('fetch_report_filters');
 		if(!frm.is_new()) {
 			frm.add_custom_button(__('Download'), function() {
 				var w = window.open(
@@ -50,6 +34,27 @@ frappe.ui.form.on('Auto Email Report', {
 	},
 	report: function(frm) {
 		frm.set_value('filters', '');
+		frm.trigger('fetch_report_filters');
+	},
+	fetch_report_filters(frm) {
+		if (frm.doc.report
+			&& frm.doc.report_type !== 'Report Builder'
+			&& frm.script_setup_for !== frm.doc.report
+		) {
+			frappe.call({
+				method: "frappe.desk.query_report.get_script",
+				args: {
+					report_name: frm.doc.report
+				},
+				callback: function(r) {
+					frappe.dom.eval(r.message.script || "");
+					frm.script_setup_for = frm.doc.report;
+					frm.trigger('show_filters');
+				}
+			});
+		} else {
+			frm.trigger('show_filters');
+		}
 	},
 	show_filters: function(frm) {
 		var wrapper = $(frm.get_field('filters_display').wrapper);