diff --git a/components/product/ProductCard/ProductCard.tsx b/components/product/ProductCard/ProductCard.tsx
index 4323977f3..16748b63a 100644
--- a/components/product/ProductCard/ProductCard.tsx
+++ b/components/product/ProductCard/ProductCard.tsx
@@ -41,7 +41,7 @@ const ProductCard: FC<Props> = ({
         </div>
         <EnhancedImage
           src={p.images.edges?.[0]?.node.urlOriginal!}
-          alt={p.name}
+          alt={p.images.edges?.[0]?.node.altText || 'Product Image'}
           width={imgWidth}
           height={imgHeight}
           priority={priority}
diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx
index 98b7bde53..deaafb6e6 100644
--- a/components/product/ProductView/ProductView.tsx
+++ b/components/product/ProductView/ProductView.tsx
@@ -85,9 +85,9 @@ const ProductView: FC<Props> = ({ product }) => {
               {product.images.edges?.map((image, i) => (
                 <div key={image?.node.urlOriginal} className={s.imageContainer}>
                   <Image
-                    alt={product.name}
                     className={s.img}
                     src={image?.node.urlOriginal!}
+                    alt={image?.node.altText || 'Product Image'}
                     width={1050}
                     height={1050}
                     priority={i === 0}
diff --git a/components/wishlist/WishlistCard/WishlistCard.tsx b/components/wishlist/WishlistCard/WishlistCard.tsx
index a356d7ecc..fffa1ecb8 100644
--- a/components/wishlist/WishlistCard/WishlistCard.tsx
+++ b/components/wishlist/WishlistCard/WishlistCard.tsx
@@ -62,7 +62,6 @@ const WishlistCard: FC<Props> = ({ item }) => {
           width={400}
           height={400}
           alt={product.images.edges?.[0]?.node.altText || 'Product Image'}
-          // The cart item image is already optimized and very small in size
         />
       </div>