diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
index 658c0e9..1440d7c 100644
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -243,6 +243,10 @@ class Shipment extends ContentEntityBase implements ShipmentInterface {
     if (!$this->get('weight')->isEmpty()) {
       return $this->get('weight')->first()->toMeasurement();
     }
+    else {
+      $this->recalculateWeight();
+      return $this->getWeight();
+    }
   }
 
   /**