diff --git a/db/migrate/20181020103501_revoke_variant_overrideswithout_permissions.rb b/db/migrate/20181020103501_revoke_variant_overrideswithout_permissions.rb
index bd2d0e750b..d8140c9bf3 100644
--- a/db/migrate/20181020103501_revoke_variant_overrideswithout_permissions.rb
+++ b/db/migrate/20181020103501_revoke_variant_overrideswithout_permissions.rb
@@ -2,11 +2,11 @@ class RevokeVariantOverrideswithoutPermissions < ActiveRecord::Migration
   def up
     # This process was executed when the permission_revoked_at colum was created (see AddPermissionRevokedAtToVariantOverrides)
     #   It needs to be repeated due to #2739
-    variant_override_hubs = Enterprise.where(id: VariantOverride.all.map(&:hub_id).uniq)
+    variant_override_hubs = Enterprise.where(id: VariantOverride.select(:hub_id).uniq)
 
-    variant_override_hubs.each do |hub|
+    variant_override_hubs.find_each do |hub|
       permitting_producer_ids = hub.relationships_as_child
-        .with_permission(:create_variant_overrides).map(&:parent_id)
+        .with_permission(:create_variant_overrides).pluck(:parent_id)
 
       variant_overrides_with_revoked_permissions = VariantOverride.for_hubs(hub)
         .joins(variant: :product).where("spree_products.supplier_id NOT IN (?)", permitting_producer_ids)