diff --git a/app/helpers/spree/admin/orders_helper.rb b/app/helpers/spree/admin/orders_helper.rb
index 5dd95ebf57..6937e2990d 100644
--- a/app/helpers/spree/admin/orders_helper.rb
+++ b/app/helpers/spree/admin/orders_helper.rb
@@ -96,8 +96,7 @@ module Spree
       def ship_order_link
         { name: t(:ship_order),
           url: '#',
-          icon: 'icon-truck',
-        }
+          icon: 'icon-truck' }
       end
 
       def cancel_order_link
diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index a90b6a37df..1ab58d530c 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -29,6 +29,7 @@ module Spree
 
     attr_accessor :use_billing, :checkout_processing, :save_bill_address,
                   :save_ship_address
+    attr_writer :send_shipment_email
 
     token_resource
 
@@ -623,10 +624,6 @@ module Spree
       @send_shipment_email
     end
 
-    def send_shipment_email=(val)
-      @send_shipment_email = val
-    end
-
     private
 
     def reapply_tax_on_changed_address
diff --git a/spec/system/admin/orders_spec.rb b/spec/system/admin/orders_spec.rb
index cf329fe3e1..41858b9e1e 100644
--- a/spec/system/admin/orders_spec.rb
+++ b/spec/system/admin/orders_spec.rb
@@ -771,7 +771,7 @@ describe '
         page.find("button.icon-road").click
 
         within ".reveal-modal" do
-          uncheck 'Send email confirmation to customer'
+          uncheck 'Send a shipment/pick up notification email to the customer.'
           expect {
             find_button("Confirm").click
           }.not_to enqueue_job(ActionMailer::MailDeliveryJob)