diff --git a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
index c17da4e..bb780e5 100644
--- a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
+++ b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
@@ -2,8 +2,9 @@
 // For license information, please see license.txt
 /* eslint-disable */
 
+
 frappe.query_reports["COGS By Item Group"] = {
-	"filters": [
+	filters: [
     {
       label: __("Company"),
       fieldname: "company",
@@ -12,22 +13,22 @@
       mandatory: true,
 			default: frappe.defaults.get_user_default("Company"),
     },
-    {
-      label: __("Account"),
-      fieldname: "account",
-      fieldtype: "Link",
-      options: "Account",
-      mandatory: true,
-			get_query() {
-				var company = frappe.query_report.get_filter_value('company');
-				return {
-					"doctype": "Account",
-					"filters": {
-						"company": company,
-					}
-				}
-			},
-    },
+    // {
+      // label: __("Account"),
+      // fieldname: "account",
+      // fieldtype: "Link",
+      // options: "Account",
+      // mandatory: true,
+			// get_query() {
+				// const company = frappe.query_report.get_filter_value('company');
+				// return {
+					// "doctype": "Account",
+					// "filters": {
+						// "company": company,
+					// }
+				// }
+			// },
+    // },
     {
       label: __("From Date"),
       fieldname: "from_date",
diff --git a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
index 7599da4..e2c6f79 100644
--- a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
+++ b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
@@ -9,12 +9,18 @@
 
 
 def execute(filters=None):
+	update_filters_with_account(filters)
 	validate_filters(filters)
 	columns = get_columns()
 	data = get_data(filters)
 	return columns, data
 
 
+def update_filters_with_account(filters):
+	account = frappe.get_value("Company", filters.get("company"), "default_expense_account")
+	filters.update(dict(account=account))
+
+
 def validate_filters(filters):
 	if filters.from_date > filters.to_date:
 		frappe.throw(_("From Date must be before To Date"))
