diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 1d561631ce8..d4c1f0342fa 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -148,11 +148,11 @@ class StockPicking(models.Model):
             current_package_carrier_type=self.carrier_id.delivery_type,
             default_picking_id=self.id
         )
-        # As we pass the `delivery_type` ('fixed' by default) in a key who correspond
-        # to the `package_carrier_type` ('none' to default), we make a conversion.
+        # As we pass the `delivery_type` ('fixed' or 'base_on_rule' by default) in a key who
+        # correspond to the `package_carrier_type` ('none' to default), we make a conversion.
         # No need conversion for other carriers as the `delivery_type` and
         #`package_carrier_type` will be the same in these cases.
-        if context['current_package_carrier_type'] == 'fixed':
+        if context['current_package_carrier_type'] in ['fixed', 'base_on_rule']:
             context['current_package_carrier_type'] = 'none'
         return {
             'name': _('Package Details'),