index 08823bacc..6c0be486e 100644
--- a/vendor/magento/module-eav/Model/Entity/AbstractEntity.php
+++ b/vendor/magento/module-eav/Model/Entity/AbstractEntity.php
@@ -12,6 +12,7 @@ use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
 use Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface as DefaultAttributesProvider;
+use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\App\Config\Element;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
@@ -1289,6 +1290,11 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
              * not needed after introduction of partial entity loading
              */
             foreach ($origData as $k => $v) {
+                if ($k === CustomAttributesDataInterface::CUSTOM_ATTRIBUTES) {
+                    foreach ($v as $custom_attribute => $data) {
+                        $origData[$custom_attribute] = $data['value'] ?: '';
+                    }
+                }
                 if (!array_key_exists($k, $newData)) {
                     unset($origData[$k]);
                 }