diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index afa1ffed605..6ad1df52cd3 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -17,7 +17,8 @@ frappe.ui.form.on("Journal Entry", {
 					"from_date": frm.doc.posting_date,
 					"to_date": frm.doc.posting_date,
 					"company": frm.doc.company,
-					group_by_voucher: 0
+					"finance_book": frm.doc.finance_book,
+					"group_by_voucher": 0
 				};
 				frappe.set_route("query-report", "General Ledger");
 			}, "fa fa-table");
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 9a774ce6b96..e3d615121ef 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -84,9 +84,7 @@ frappe.query_reports["General Ledger"] = {
 
 				var party_type = frappe.query_report_filters_by_name.party_type.get_value();
 				var parties = frappe.query_report_filters_by_name.party.get_value();
-				if(!party_type) {
-					frappe.throw(__("Please select Party Type first"));
-				}
+				if(!party_type) return;
 
 				const values = parties.split(/\s*,\s*/).filter(d => d);
 				const txt = parties.match(/[^,\s*]*$/)[0] || '';