diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index de630512b54e..95ad53fe99aa 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();
     }