diff --git a/src/components/cells/ProductAdditionalAttributes/ProductAdditionalAttributes.tsx b/src/components/cells/ProductAdditionalAttributes/ProductAdditionalAttributes.tsx
index 3229cc81..3d1a7e5d 100644
--- a/src/components/cells/ProductAdditionalAttributes/ProductAdditionalAttributes.tsx
+++ b/src/components/cells/ProductAdditionalAttributes/ProductAdditionalAttributes.tsx
@@ -6,17 +6,20 @@ export const ProductAdditionalAttributes = ({
 }: {
   attributes: AdditionalAttributeProps[]
 }) => {
-  if (!attributes.length) return null
+
+  if (!attributes?.length) return null
+
+  const nonEmptyAttributes = attributes.filter((attribute) => !!attribute && attribute.id)
 
   return (
     <ProductPageAccordion heading="Additional attributes" defaultOpen={false}>
-      {attributes.map((attribute) => (
+      {nonEmptyAttributes.map((attribute) => (
         <div
-          key={attribute.id}
+          key={attribute?.id}
           className="border rounded-sm grid grid-cols-2 text-center label-md"
         >
-          <div className="border-r py-3">{attribute.attribute.name}</div>
-          <div className="py-3">{attribute.value}</div>
+          <div className="border-r py-3">{attribute?.attribute?.name}</div>
+          <div className="py-3">{attribute?.value}</div>
         </div>
       ))}
     </ProductPageAccordion>