diff --git a/api/app/controllers/spree/api/orders_controller.rb b/api/app/controllers/spree/api/orders_controller.rb
index 9433132ef59..2dab428cf40 100644
--- a/api/app/controllers/spree/api/orders_controller.rb
+++ b/api/app/controllers/spree/api/orders_controller.rb
@@ -51,7 +51,18 @@ def empty
 
       def index
         authorize! :index, Order
-        @orders = paginate(Spree::Order.ransack(params[:q]).result)
+        orders_includes = [
+          :user,
+          :payments,
+          :adjustments,
+          :line_items
+        ]
+        @orders = paginate(
+          Spree::Order
+            .ransack(params[:q])
+            .result
+            .includes(orders_includes)
+        )
         respond_with(@orders)
       end
 
diff --git a/api/app/controllers/spree/api/products_controller.rb b/api/app/controllers/spree/api/products_controller.rb
index 185e3d733fa..effd6a178c3 100644
--- a/api/app/controllers/spree/api/products_controller.rb
+++ b/api/app/controllers/spree/api/products_controller.rb
@@ -8,7 +8,16 @@ def index
           ids = params[:ids].split(",").flatten
           @products = product_scope.where(id: ids)
         else
-          @products = product_scope.ransack(params[:q]).result
+          products_includes = [
+            :variants,
+            :option_types,
+            :product_properties,
+            { classifications: :taxon }
+          ]
+          @products = product_scope
+                        .ransack(params[:q])
+                        .result
+                        .includes(products_includes)
         end
 
         @products = paginate(@products.distinct)