diff --git a/app/controllers/shop/shop_controller.rb b/app/controllers/shop/shop_controller.rb
index 7b9956cbee..95d18a0e2e 100644
--- a/app/controllers/shop/shop_controller.rb
+++ b/app/controllers/shop/shop_controller.rb
@@ -34,7 +34,7 @@ class Shop::ShopController < BaseController
     @order_cycles = OrderCycle.with_distributor(@distributor).active
     
     # And default to the only order cycle if there's only the one
-    if @order_cycles.count == 1 and current_order_cycle.nil?
+    if @order_cycles.count == 1
       current_order(true).set_order_cycle! @order_cycles.first
     end
   end