diff --git a/app/views/spree/api/products/bulk_show.v1.rabl b/app/views/spree/api/products/bulk_show.v1.rabl
index 534dd87846..1f07d3d91f 100644
--- a/app/views/spree/api/products/bulk_show.v1.rabl
+++ b/app/views/spree/api/products/bulk_show.v1.rabl
@@ -1,5 +1,8 @@
 object @product
-attributes :id, :name, :price, :on_hand, :variant_unit, :variant_unit_scale, :variant_unit_name
+attributes :id, :name, :price, :variant_unit, :variant_unit_scale, :variant_unit_name, :on_demand
+
+# Infinity is not a valid JSON object, but Rails encodes it anyway
+node( :on_hand ) { |p| p.on_hand.to_f.finite? ? p.on_hand : "On demand" }
 
 node( :available_on ) { |p| p.available_on.blank? ? "" : p.available_on.strftime("%F %T") }
 node( :permalink_live ) { |p| p.permalink }
@@ -9,4 +12,3 @@ end
 node( :variants ) do |p|
 	partial 'spree/api/variants/bulk_index', :object => p.variants.order('id ASC')
 end
-
diff --git a/app/views/spree/api/variants/bulk_show.v1.rabl b/app/views/spree/api/variants/bulk_show.v1.rabl
index fa487068fa..ee069c600c 100644
--- a/app/views/spree/api/variants/bulk_show.v1.rabl
+++ b/app/views/spree/api/variants/bulk_show.v1.rabl
@@ -1,3 +1,6 @@
 object @variant
 
-attributes :id, :options_text, :price, :unit_value, :unit_description, :on_hand
\ No newline at end of file
+attributes :id, :options_text, :price, :unit_value, :unit_description, :on_demand
+
+# Infinity is not a valid JSON object, but Rails encodes it anyway
+node( :on_hand ) { |p| p.on_hand.to_f.finite? ? p.on_hand : "On demand" }