diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx
index a9385b2f0..3d64ea0b3 100644
--- a/components/product/ProductView/ProductView.tsx
+++ b/components/product/ProductView/ProductView.tsx
@@ -119,7 +119,8 @@ const ProductView: FC<Props> = ({ product }) => {
                       <Swatch
                         key={`${opt.id}-${i}`}
                         active={v.label.toLowerCase() === active}
-                        variant={opt.displayName}
+                        // variant={opt.displayName}
+                        variant={opt.variant}
                         color={v.hexColors ? v.hexColors[0] : ''}
                         label={v.label}
                         onClick={() => {
diff --git a/framework/saleor/product/get-product.ts b/framework/saleor/product/get-product.ts
index 139aca908..cce96a0d2 100644
--- a/framework/saleor/product/get-product.ts
+++ b/framework/saleor/product/get-product.ts
@@ -22,10 +22,8 @@ const getProduct = async (options: {
     variables,
   })
 
-  const { product } = data
-
   return {
-    product: product ? normalizeProduct(product) : null,
+    product: data?.product ? normalizeProduct(data.product) : null,
   }
 }
 
diff --git a/framework/saleor/utils/normalize.ts b/framework/saleor/utils/normalize.ts
index 4c1894647..814467c83 100644
--- a/framework/saleor/utils/normalize.ts
+++ b/framework/saleor/utils/normalize.ts
@@ -21,33 +21,41 @@ const money = ({ amount, currency }: Money) => {
 }
 
 const normalizeProductOptions = (options: ProductVariant[]) => {
-  const optionNames = options
-    .map((option) => {
-      // can a variant have multiple attributes?
-      return option.attributes[0].attribute.name
-    })
-    .filter((x, i, a) => a.indexOf(x) == i)
+  return options
+    ?.map((option) => option?.attributes)
+    .flat(1)
+    .reduce<any>((acc, x) => {
+      if (
+        acc.find(({ displayName }: any) => displayName === x.attribute.name)
+      ) {
+        return acc.map((opt: any) => {
+          return opt.displayName === x.attribute.name
+            ? {
+                ...opt,
+                values: [
+                  ...opt.values,
+                  ...x.values.map((value: any) => ({
+                    label: value?.name,
+                  })),
+                ],
+              }
+            : opt
+        })
+      }
 
-  return optionNames.map((displayName) => {
-    const matchedOptions = options.filter(
-      ({ attributes }) => attributes[0].attribute.name === displayName // can a variant have multiple attributes?
-    )
-
-    return {
-      __typename: 'MultipleChoiceOption',
-      // next-commerce can only display labels for options with displayName 'size', or colors
-      displayName: displayName?.toLowerCase().includes('size')
-        ? 'size'
-        : displayName,
-      values: matchedOptions.map(({ name }) => ({
-        label: name,
-      })),
-    }
-  })
+      return acc.concat({
+        __typename: 'MultipleChoiceOption',
+        displayName: x.attribute.name,
+        variant: 'size',
+        values: x.values.map((value: any) => ({
+          label: value?.name,
+        })),
+      })
+    }, [])
 }
 
-const normalizeProductVariants = (variants: ProductVariant[]) =>
-  variants?.map((variant) => {
+const normalizeProductVariants = (variants: ProductVariant[]) => {
+  return variants?.map((variant) => {
     const { id, sku, name, pricing } = variant
     const price = pricing?.price?.net && money(pricing.price.net)?.value
 
@@ -61,6 +69,7 @@ const normalizeProductVariants = (variants: ProductVariant[]) =>
       options: normalizeProductOptions([variant]),
     }
   })
+}
 
 export function normalizeProduct(productNode: SaleorProduct): Product {
   const {