diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb
index dfd45230b6..ae58f1335a 100644
--- a/app/models/order_cycle.rb
+++ b/app/models/order_cycle.rb
@@ -132,7 +132,11 @@ class OrderCycle < ActiveRecord::Base
   end
 
   def variants
-    self.exchanges.map(&:variants).flatten.uniq.reject(&:deleted?)
+    Spree::Variant.
+      joins(:exchanges).
+      merge(Exchange.in_order_cycle(self)).
+      not_deleted.
+      select('DISTINCT spree_variants.*')
   end
 
   def distributed_variants