diff --git a/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php b/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
index abcefc720ca35..2362d71845117 100644
--- a/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
@@ -7,7 +7,7 @@
 
 use Magento\Downloadable\Api\SampleRepositoryInterface as SampleRepository;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
-
+use Magento\Framework\App\RequestInterface;
 /**
  * Class ReadHandler
  */
@@ -21,9 +21,16 @@ class ReadHandler implements ExtensionInterface
     /**
      * @param SampleRepository $sampleRepository
      */
-    public function __construct(SampleRepository $sampleRepository)
+
+    /**
+     * @var RequestInterface
+     */
+    protected $request;
+
+    public function __construct(SampleRepository $sampleRepository,RequestInterface $request)
     {
         $this->sampleRepository = $sampleRepository;
+        $this->request = $request;
     }
 
     /**
@@ -40,7 +47,10 @@ public function execute($entity, $arguments = [])
         }
         $entityExtension = $entity->getExtensionAttributes();
         $samples = $this->sampleRepository->getSamplesByProduct($entity);
-        if ($samples) {
+
+        $downloadable = $this->request->getPost('downloadable');
+        
+        if ($samples && isset($downloadable['sample']) && is_array($downloadable['sample'])) {
             $entityExtension->setDownloadableProductSamples($samples);
         }
         $entity->setExtensionAttributes($entityExtension);