diff --git a/app/serializers/api/cached_enterprise_serializer.rb b/app/serializers/api/cached_enterprise_serializer.rb
index cec5388204..f3e4700284 100644
--- a/app/serializers/api/cached_enterprise_serializer.rb
+++ b/app/serializers/api/cached_enterprise_serializer.rb
@@ -163,7 +163,11 @@ module Api
     private
 
     def product_properties
-      enterprise.supplied_products.flat_map(&:properties)
+      Spree::Property.joins(:product_properties).where(
+        spree_product_properties: {
+          product_id: enterprise.supplied_product_ids
+        }
+      ).select('DISTINCT spree_properties.*')
     end
 
     def producer_properties