diff --git a/app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.php
index 3ebf05ea59c0e..9fa50c177d2f8 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.php
@@ -106,6 +106,7 @@ public function buildBlock($product, $displayArea)
 
         $type = isset($imageArguments['type']) ? $imageArguments['type'] : null;
         $baseFilePath = $product->getData($type);
+        $baseFilePath = $baseFilePath === 'no_selection' ? null : $baseFilePath;
 
         $imageAsset = $this->viewAssetImageFactory->create(
             [