diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 78f718a1a87..7eddcc52d04 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -184,21 +184,20 @@ class StockPicking(models.Model):
             carrier_trackers = json.loads(self.carrier_tracking_url)
         except ValueError:
             carrier_trackers = self.carrier_tracking_url
-
-        if len(carrier_trackers) > 1:
+        else:
             msg = "Tracking links for shipment: <br/>"
             for tracker in carrier_trackers:
                 msg += '<a href=' + tracker[1] + '>' + tracker[0] + '</a><br/>'
             self.message_post(body=msg)
             return self.env.ref('delivery.act_delivery_trackers_url').read()[0]
-        else:
-            client_action = {
-                'type': 'ir.actions.act_url',
-                'name': "Shipment Tracking Page",
-                'target': 'new',
-                'url': self.carrier_tracking_url,
-            }
-            return client_action
+
+        client_action = {
+            'type': 'ir.actions.act_url',
+            'name': "Shipment Tracking Page",
+            'target': 'new',
+            'url': self.carrier_tracking_url,
+        }
+        return client_action
 
     @api.one
     def cancel_shipment(self):
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 4266265da67..d3e3e7e1a43 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -302,7 +302,7 @@
                 <form string="Trackers URL">
                     <group>
                         <div class="alert alert-info">
-                            <p>You have multiple URL, they should be available in the chatter.</p>
+                            <p>You have multiple tracker links, they are available in the chatter.</p>
                         </div>
                     </group>
                     <footer>