From d9144b5d652bc3ebb930949f9b68d7b6285f72c7 Mon Sep 17 00:00:00 2001
From: Maikel <maikelkoek@gmail.com>
Date: Wed, 9 Apr 2025 15:54:18 +0200
Subject: [PATCH] only load attributes from set of given entity type

---
 app/code/Magento/Eav/Model/AttributeManagement.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index de630512b54e9..95ad53fe99aa0 100644
--- a/app/code/Magento/Eav/Model/AttributeManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -182,7 +182,9 @@ public function getAttributes($entityType, $attributeSetId)
             throw NoSuchEntityException::singleField('attributeSetId', $attributeSetId);
         }
         $attributeCollection = $this->attributeCollectionFactory->create();
-        $attributeCollection->setAttributeSetFilter($attributeSet->getAttributeSetId())->load();
+        $attributeCollection->setAttributeSetFilter($attributeSet->getAttributeSetId())
+            ->addFieldToFilter('entity_attribute.entity_type_id', $requiredEntityTypeId)
+            ->load();
 
         return $attributeCollection->getItems();
     }