diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 0c941be57e..dcbe1022c2 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,6 +1,6 @@
 Shop.factory 'OrderCycle', ($resource, Product, orderCycleData) ->
   class OrderCycle
-    @order_cycle = orderCycleData
+    @order_cycle = orderCycleData || {}
     @push_order_cycle: ->
       new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
         OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 7a868d0189..d4fbde9365 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -55,7 +55,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
           it "allows us to select an order cycle" do
             select "frogs", :from => "order_cycle_id"
             page.should have_selector "products"
-            sleep 5
             Spree::Order.last.order_cycle.should == oc1
           end
 
diff --git a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
index 06ae492f99..e7ef7f60b1 100644
--- a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
@@ -32,4 +32,3 @@ describe 'OrderCycle service', ->
     $httpBackend.flush()
     expect(OrderCycle.order_cycle.orders_close_at).toEqual(datestring)
 
-