diff --git a/app/views/spree/shipment_mailer/shipped_email.html.haml b/app/views/spree/shipment_mailer/shipped_email.html.haml
index cd8a9eb15d..465c61ffea 100644
--- a/app/views/spree/shipment_mailer/shipped_email.html.haml
+++ b/app/views/spree/shipment_mailer/shipped_email.html.haml
@@ -15,11 +15,11 @@
     %br
 
 - if @shipment.tracking
-  %p
+  %p.lead
     = t('.track_information', tracking: @shipment.tracking)
 
 - if @shipment.tracking_url
-  %p
+  %p.lead
     = t('.track_link', url: @shipment.tracking_url)
 
 %p.lead
diff --git a/spec/mailers/previews/shipment_preview.rb b/spec/mailers/previews/shipment_preview.rb
index 69721c1e9f..28a396b92b 100644
--- a/spec/mailers/previews/shipment_preview.rb
+++ b/spec/mailers/previews/shipment_preview.rb
@@ -5,7 +5,10 @@ require 'open_food_network/scope_variant_to_hub'
 module Spree
   class ShipmentPreview < ActionMailer::Preview
     def shipped
-      ShipmentMailer.shipped_email(Shipment.last)
+      shipment =
+        Shipment.where.not(tracking: [nil, ""]).last ||
+        Shipment.last
+      ShipmentMailer.shipped_email(shipment)
     end
   end
 end