diff --git a/app/controllers/admin/customers_controller.rb b/app/controllers/admin/customers_controller.rb
index 8143df7ee2..680248e94f 100644
--- a/app/controllers/admin/customers_controller.rb
+++ b/app/controllers/admin/customers_controller.rb
@@ -67,7 +67,7 @@ module Admin
       enterprise_id = Enterprise.managed_by(spree_current_user).
         select('enterprises.id').find_by_id(params[:enterprise_id])
 
-      Customer.of(enterprise_id).includes(user: :credit_cards)
+      Customer.of(enterprise_id).includes(:bill_address, :ship_address, user: :credit_cards)
     end
 
     def load_managed_shops