diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 688f1b3b16..34398bbe7d 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -76,9 +76,7 @@ Spree::Order.class_eval do
   }
 
   scope :with_line_items_variants_and_products, lambda {
-    joins('INNER JOIN spree_line_items ON (spree_line_items.order_id = spree_orders.id)').
-      joins('INNER JOIN spree_variants ON (spree_variants.id = spree_line_items.variant_id)').
-      joins('INNER JOIN spree_products ON (spree_products.id = spree_variants.product_id)')
+    joins(line_items: { variant: :product })
   }
 
   scope :not_state, lambda { |state|