diff --git a/src/app/core/models/product/product.mapper.ts b/src/app/core/models/product/product.mapper.ts
index e12cd648429..57dd587aa1f 100644
--- a/src/app/core/models/product/product.mapper.ts
+++ b/src/app/core/models/product/product.mapper.ts
@@ -188,7 +188,11 @@ export class ProductMapper {
       minOrderQuantity: data.minOrderQuantity || 1,
       packingUnit: data.packingUnit,
       maxOrderQuantity: data.maxOrderQuantity || 100,
-      attributes: data.attributes,
+      attributes:
+        (data.attributeGroups &&
+          data.attributeGroups.PRODUCT_DETAIL_ATTRIBUTES &&
+          data.attributeGroups.PRODUCT_DETAIL_ATTRIBUTES.attributes) ||
+        data.attributes,
       attributeGroups: data.attributeGroups,
       images: this.imageMapper.fromImages(data.images),
       listPrice: filterPrice(data.listPrice),