diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 9b4e51ff55e..1cb9ed88b04 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -75,7 +75,9 @@ class StockPicking(models.Model):
 
         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()
+
+        if self.carrier_id:
+            self._add_delivery_cost_to_so()
 
         return res