diff --git a/src/products/components/ProductShipping/ProductShipping.tsx b/src/products/components/ProductShipping/ProductShipping.tsx
index a4ddcc43c..c92de3c64 100644
--- a/src/products/components/ProductShipping/ProductShipping.tsx
+++ b/src/products/components/ProductShipping/ProductShipping.tsx
@@ -49,7 +49,9 @@ const ProductShipping: React.FC<ProductShippingProps> = props => {
             onChange={onChange}
             InputProps={{
               endAdornment: (
-                <InputAdornment position="end">{weightUnit}</InputAdornment>
+                <InputAdornment position="end">
+                  {weightUnit || ""}
+                </InputAdornment>
               ),
               inputProps: {
                 min: 0
diff --git a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx
index 9685f24a0..a873f1d20 100644
--- a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx
+++ b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx
@@ -52,7 +52,7 @@ function getAttributeValue(
   attributes: VariantAttributeInput[]
 ): string {
   const attribute = attributes.find(attr => attr.id === id);
-  return attribute.value;
+  return attribute?.value === null ? undefined : attribute.value;
 }
 
 function getAttributeValueChoices(
diff --git a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx
index 1b73f0c4f..ba8fc274a 100644
--- a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx
+++ b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx
@@ -90,7 +90,7 @@ const ProductVariantNavigation: React.FC<ProductVariantNavigationProps> = props
             <SortableTableRow
               hover={!!variant}
               key={variant ? variant.id : "skeleton"}
-              index={variantIndex}
+              index={variantIndex || 0}
               className={classNames(classes.link, {
                 [classes.tabActive]: variant && variant.id === current
               })}