diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb
index a17d6e81f9..39831711ff 100644
--- a/app/helpers/injection_helper.rb
+++ b/app/helpers/injection_helper.rb
@@ -1,6 +1,6 @@
 module InjectionHelper
   def inject_enterprises
-    inject_json_ams "enterprises", Enterprise.activated.all, Api::EnterpriseSerializer, active_distributors: @active_distributors, earliest_closing_times: OrderCycle.earliest_closing_times
+    inject_json_ams "enterprises", Enterprise.activated.all, Api::EnterpriseSerializer, active_distributors: @active_distributors, earliest_closing_times: OrderCycle.earliest_closing_times, shipping_method_services: Spree::ShippingMethod.services
   end
 
   def inject_current_order
diff --git a/app/serializers/api/enterprise_serializer.rb b/app/serializers/api/enterprise_serializer.rb
index 626fe77cad..f7bd06f239 100644
--- a/app/serializers/api/enterprise_serializer.rb
+++ b/app/serializers/api/enterprise_serializer.rb
@@ -42,11 +42,13 @@ class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
   has_one :address, serializer: Api::AddressSerializer
 
   def pickup
-    object.shipping_methods.where(:require_ship_address => false).present?
+    services = options[:shipping_method_services][object.id]
+    services ? services[:pickup] : false
   end
 
   def delivery
-    object.shipping_methods.where(:require_ship_address => true).present?
+    services = options[:shipping_method_services][object.id]
+    services ? services[:delivery] : false
   end
 
   def email