diff --git a/vendor/magento/module-catalog-url-rewrite/Model/ProductUrlPathGenerator.php b/vendor/magento/module-catalog-url-rewrite/Model/ProductUrlPathGenerator.php
index 2e192d8..e4d133b 100644
--- a/vendor/magento/module-catalog-url-rewrite/Model/ProductUrlPathGenerator.php
+++ b/vendor/magento/module-catalog-url-rewrite/Model/ProductUrlPathGenerator.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogUrlRewrite\Model;

+use Magento\Catalog\Model\Product;
 use Magento\Store\Model\Store;

 class ProductUrlPathGenerator
@@ -136,7 +137,12 @@ class ProductUrlPathGenerator
     protected function prepareProductUrlKey(\Magento\Catalog\Model\Product $product)
     {
         $urlKey = $product->getUrlKey();
-        return $product->formatUrlKey($urlKey === '' || $urlKey === null ? $product->getName() : $urlKey);
+        if ($urlKey === '' || $urlKey === null) {
+            $productName = $product->getName();
+            $urlKey = $productName === null ? $product->getOrigData(Product::NAME) : $productName;
+        }
+
+        return $product->formatUrlKey($urlKey);
     }

     /**
diff --git a/vendor/magento/module-catalog-url-rewrite/Observer/ProductUrlKeyAutogeneratorObserver.php b/vendor/magento/module-catalog-url-rewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
index b201ae3..28f43d0 100644
--- a/vendor/magento/module-catalog-url-rewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
+++ b/vendor/magento/module-catalog-url-rewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
@@ -33,6 +33,8 @@ class ProductUrlKeyAutogeneratorObserver implements ObserverInterface
     {
         /** @var Product $product */
         $product = $observer->getEvent()->getProduct();
-        $product->setUrlKey($this->productUrlPathGenerator->getUrlKey($product));
+        if ($product->isObjectNew() || !empty($product->getData('use_default')['url_key'])) {
+            $product->setUrlKey($this->productUrlPathGenerator->getUrlKey($product));
+        }
     }
 }