diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
index 4b1b684ea2f8c..70b2948501d2d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
@@ -84,6 +84,10 @@ public function __construct(
      */
     public function getElementHtml()
     {
+        if ($this->getForm()->getDataObject()->getTypeInstance()->hasWeight()) {
+            $this->weightSwitcher->setValue(WeightResolver::HAS_WEIGHT);
+        }
+
         if ($this->getDisabled()) {
             $this->weightSwitcher->setDisabled($this->getDisabled());
         }