Merge pull request #13575 from woocommerce/fix-13573

Only show thumbs if there is a main post thumbnail

templates/single-product/product-thumbnails.php

@@ -24,7 +24,7 @@ global $post, $product;
 
 $attachment_ids = $product->get_gallery_image_ids();
 
-if ( $attachment_ids ) {
+if ( $attachment_ids && has_post_thumbnail() ) {
 	foreach ( $attachment_ids as $attachment_id ) {
 		$full_size_image  = wp_get_attachment_image_src( $attachment_id, 'full' );
 		$thumbnail        = wp_get_attachment_image_src( $attachment_id, 'shop_thumbnail' );