diff --git a/app/models/concerns/order_shipment.rb b/app/models/concerns/order_shipment.rb
index dd5ebeba01..0a1c30f625 100644
--- a/app/models/concerns/order_shipment.rb
+++ b/app/models/concerns/order_shipment.rb
@@ -13,7 +13,9 @@ require 'active_support/concern'
 module OrderShipment
   extend ActiveSupport::Concern
 
-  attr_accessor :manual_shipping_selection
+  included do
+    attr_accessor :manual_shipping_selection
+  end
 
   def shipment
     shipments.first
diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 1d37534b07..a549cab3d9 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -4,12 +4,10 @@ require 'spree/order/checkout'
 require 'open_food_network/enterprise_fee_calculator'
 require 'open_food_network/feature_toggle'
 require 'open_food_network/tag_rule_applicator'
-require 'concerns/order_shipment'
 
 module Spree
   class Order < ApplicationRecord
-    prepend OrderShipment
-
+    include OrderShipment
     include Checkout
     include Balance