diff --git a/app/models/build_list.rb b/app/models/build_list.rb
index 106bdbd5a..b149e55ab 100644
--- a/app/models/build_list.rb
+++ b/app/models/build_list.rb
@@ -689,6 +689,11 @@ class BuildList < ActiveRecord::Base
   end
 
   def prepare_extra_build_lists
+    if mass_build && mass_build.extra_mass_builds.present?
+      extra_build_lists ||= []
+      extra_build_lists << BuildList.where(mass_build_id: mass_build.extra_mass_builds, arch_id: arch_id).pluck(:id)
+      extra_build_lists.flatten!
+    end
     return if extra_build_lists.blank?
     bls = BuildList.for_extra_build_lists(extra_build_lists, current_ability, save_to_platform)
     if save_to_platform