diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index ccfa9f860a..db8e31d5ae 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -8,8 +8,8 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
   $scope.page = 1
   $scope.per_page = 10
   $scope.order_cycle = OrderCycle.order_cycle
-  $scope.supplied_taxons = {}
-  $scope.supplied_properties = {}
+  $scope.supplied_taxons = null
+  $scope.supplied_properties = null
 
   $rootScope.$on "orderCycleSelected", ->
     $scope.update_filters()
@@ -20,18 +20,17 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
 
     return unless order_cycle_id
 
-    $scope.supplied_taxons = {}
-    $scope.supplied_properties = {}
-
     params = {
       id: order_cycle_id,
       distributor: currentHub.id
     }
     OrderCycleResource.taxons params, (data)=>
+      $scope.supplied_taxons = {}
       data.map( (taxon) ->
         $scope.supplied_taxons[taxon.id] = Taxons.taxons_by_id[taxon.id]
       )
     OrderCycleResource.properties params, (data)=>
+      $scope.supplied_properties = {}
       data.map( (property) ->
         $scope.supplied_properties[property.id] = Properties.properties_by_id[property.id]
       )
diff --git a/app/views/shop/products/_filters.html.haml b/app/views/shop/products/_filters.html.haml
index 8d7f03f16e..100ccecc0a 100644
--- a/app/views/shop/products/_filters.html.haml
+++ b/app/views/shop/products/_filters.html.haml
@@ -1,5 +1,5 @@
-.filter-shopfront.taxon-selectors.text-right{ng: {show: 'supplied_taxons && !Products.loading'}}
+.filter-shopfront.taxon-selectors.text-right{ng: {show: 'supplied_taxons != null'}}
   %single-line-selectors{ selectors: "taxonSelectors", objects: "supplied_taxons", "active-selectors" => "activeTaxons"}
 
-.filter-shopfront.property-selectors.text-right{ng: {show: 'supplied_properties && !Products.loading'}}
+.filter-shopfront.property-selectors.text-right{ng: {show: 'supplied_properties != null'}}
   %single-line-selectors{ selectors: "propertySelectors", objects: "supplied_properties", "active-selectors" => "activeProperties"}