diff --git a/erpnext/e_commerce/product_data_engine/filters.py b/erpnext/e_commerce/product_data_engine/filters.py
index f9e3b6ae32e..6d44b2cb977 100644
--- a/erpnext/e_commerce/product_data_engine/filters.py
+++ b/erpnext/e_commerce/product_data_engine/filters.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 import frappe
-from frappe import _dict
 from frappe.utils import floor
 
 
@@ -96,38 +95,32 @@ class ProductFiltersBuilder:
 			return
 
 		attributes = [row.attribute for row in self.doc.filter_attributes]
-		attribute_docs = [
-			frappe.get_doc('Item Attribute', attribute) for attribute in attributes
-		]
 
-		valid_attributes = []
+		if not attributes:
+			return []
 
-		for attr_doc in attribute_docs:
-			selected_attributes = []
-			for attr in attr_doc.item_attribute_values:
-				or_filters = []
-				filters= [
-					["Item Variant Attribute", "attribute", "=", attr.parent],
-					["Item Variant Attribute", "attribute_value", "=", attr.attribute_value]
-				]
-				if self.item_group:
-					or_filters.extend([
-						["item_group", "=", self.item_group],
-						["Website Item Group", "item_group", "=", self.item_group]
-					])
+		result = frappe.db.sql(
+			"""
+			select
+				distinct attribute, attribute_value
+			from
+				`tabItem Variant Attribute`
+			where
+				attribute in %(attributes)s
+				and attribute_value is not null
+		""",
+			{"attributes": attributes},
+			as_dict=1,
+		)
 
-				if frappe.db.get_all("Item", filters, or_filters=or_filters, limit=1):
-					selected_attributes.append(attr)
+		attribute_value_map = {}
+		for d in result:
+			attribute_value_map.setdefault(d.attribute, []).append(d.attribute_value)
 
-			if selected_attributes:
-				valid_attributes.append(
-					_dict(
-						item_attribute_values=selected_attributes,
-						name=attr_doc.name
-					)
-				)
-
-		return valid_attributes
+		out = []
+		for name, values in attribute_value_map.items():
+			out.append(frappe._dict(name=name, item_attribute_values=values))
+		return out
 
 	def get_discount_filters(self, discounts):
 		discount_filters = []
@@ -147,4 +140,4 @@ class ProductFiltersBuilder:
 			label = f"{discount}% and below"
 			discount_filters.append([discount, label])
 
-		return discount_filters
\ No newline at end of file
+		return discount_filters
diff --git a/erpnext/e_commerce/product_data_engine/test_product_data_engine.py b/erpnext/e_commerce/product_data_engine/test_product_data_engine.py
index 925e6e7be3c..b52e140fcc4 100644
--- a/erpnext/e_commerce/product_data_engine/test_product_data_engine.py
+++ b/erpnext/e_commerce/product_data_engine/test_product_data_engine.py
@@ -175,9 +175,7 @@ class TestProductDataEngine(unittest.TestCase):
 
 		filter_engine = ProductFiltersBuilder()
 		attribute_filter = filter_engine.get_attribute_filters()[0]
-		attributes = attribute_filter.item_attribute_values
-
-		attribute_values = [d.attribute_value for d in attributes]
+		attribute_values = attribute_filter.item_attribute_values
 
 		self.assertEqual(attribute_filter.name, "Test Size")
 		self.assertGreater(len(attribute_values), 0)
@@ -349,4 +347,4 @@ def create_variant_web_item():
 		variant.save()
 
 	if not frappe.db.exists("Website Item", {"variant_of": "Test Web Item"}):
-		make_website_item(variant, save=True)
\ No newline at end of file
+		make_website_item(variant, save=True)
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index 889cf1ab38d..892d62513e2 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -339,15 +339,15 @@
 		<div class="filter-options">
 			{% for attr_value in attribute.item_attribute_values %}
 			<div class="checkbox">
-				<label data-value="{{ attr_value }}">
+				<label>
 					<input type="checkbox"
 						class="product-filter attribute-filter"
-						id="{{attr_value.name}}"
+						id="{{ attr_value }}"
 						data-attribute-name="{{ attribute.name }}"
-						data-attribute-value="{{ attr_value.attribute_value }}"
+						data-attribute-value="{{ attr_value }}"
 						style="width: 14px !important"
 						{% if attr_value.checked %} checked {% endif %}>
-						<span class="label-area">{{ attr_value.attribute_value }}</span>
+						<span class="label-area">{{ attr_value }}</span>
 				</label>
 			</div>
 			{% endfor %}