diff --git a/app/controllers/admin/products_v3_controller.rb b/app/controllers/admin/products_v3_controller.rb
index d328e4abfb..fb5efe5d1a 100644
--- a/app/controllers/admin/products_v3_controller.rb
+++ b/app/controllers/admin/products_v3_controller.rb
@@ -87,14 +87,16 @@ module Admin
 
     # Optimise by pre-loading required columns
     def product_query_includes
-      # TODO: add other fields used in columns? (eg supplier: [:name])
       [
-        # variants: [
-        #   :default_price,
-        #   :stock_locations,
-        #   :stock_items,
-        #   :variant_overrides
-        # ]
+        :image,
+        :supplier,
+        { variants: [
+          :default_price,
+          :primary_taxon,
+          :product,
+          :stock_items,
+          :tax_category,
+        ] },
       ]
     end
 
diff --git a/spec/system/admin/products_v3/products_spec.rb b/spec/system/admin/products_v3/products_spec.rb
index af556bf494..ec588ec7d7 100644
--- a/spec/system/admin/products_v3/products_spec.rb
+++ b/spec/system/admin/products_v3/products_spec.rb
@@ -22,7 +22,7 @@ describe 'As an admin, I can manage products', feature: :admin_style_v3 do
 
     expect{
       visit admin_products_url
-    }.to query_database 416.times # goodness me. Remember this includes user session updates etc.
+    }.to query_database 243.times # Remember this includes user session updates etc.
   end
 
   describe "sorting" do