diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index cec308469a7..79d67ffb4ba 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -823,7 +823,7 @@ class Picking(models.Model):
 
     def should_print_delivery_address(self):
         self.ensure_one()
-        return self.move_ids_without_package and self.move_ids_without_package[0].partner_id and self._is_to_external_location()
+        return self.move_ids and self.move_ids[0].partner_id and self._is_to_external_location()
 
     def _is_to_external_location(self):
         self.ensure_one()
diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 801148c98c1..f51a7bc4f83 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -11,7 +11,7 @@
                         <div name="outgoing_delivery_address"
                             t-if="o.should_print_delivery_address()">
                             <span><strong>Delivery Address:</strong></span>
-                            <div t-field="o.move_ids_without_package[0].partner_id"
+                            <div t-field="o.move_ids[0].partner_id"
                                 t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
                         </div>
                         <div name="outgoing_warehouse_address"
diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml
index 452a096de6a..69364700bca 100644
--- a/addons/stock/report/report_stockpicking_operations.xml
+++ b/addons/stock/report/report_stockpicking_operations.xml
@@ -14,12 +14,12 @@
                             </div>
                             <div class="row">
                                 <div class="col-6" name="div_outgoing_address">
-                                    <div t-if="o.move_ids_without_package and o.move_ids_without_package[0].partner_id and o.move_ids_without_package[0].partner_id.id != o.partner_id.id">
+                                    <div t-if="o.should_print_delivery_address()">
                                         <span><strong>Delivery Address:</strong></span>
-                                        <div t-field="o.move_ids_without_package[0].partner_id"
+                                        <div t-field="o.move_ids[0].partner_id"
                                             t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
                                     </div>
-                                    <div t-if="o.picking_type_id.code != 'internal' and (not o.move_ids_without_package or not o.move_ids_without_package[0].partner_id) and o.picking_type_id.warehouse_id.partner_id">
+                                    <div t-elif="o.picking_type_id.code != 'internal' and o.picking_type_id.warehouse_id.partner_id">
                                         <span><strong>Warehouse Address:</strong></span>
                                         <div t-field="o.picking_type_id.warehouse_id.partner_id"
                                             t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>