diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 75ce85ca45c..5d985166fce 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -73,9 +73,11 @@ class StockPicking(models.Model):
         self.ensure_one()
         res = super(StockPicking, self).do_transfer()
 
+        if self.carrier_id:
+            self._add_delivery_cost_to_so()
+
         if self.carrier_id and self.carrier_id.delivery_type not in ['fixed', 'base_on_rule'] and self.carrier_id.shipping_enabled:
             self.send_to_shipper()
-            self._add_delivery_cost_to_so()
         elif self.carrier_id and self.carrier_id.delivery_type in ['fixed', 'base_on_rule'] and self.carrier_id.shipping_enabled:
             self.carrier_price = sum(self.sale_id.order_line.filtered(lambda r: r.is_delivery).mapped('price_unit'))