diff --git a/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb b/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
index 6b326bc0b69..bfeb09f6da1 100644
--- a/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
+++ b/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
@@ -12,11 +12,13 @@ class MigrateStageIdReferenceInBackground < ActiveRecord::Migration
   end
 
   def up
-    Build.find_in_batches(batch_size: BATCH_SIZE).with_index do |builds, batch|
-      migrations = builds.map { |build| [MIGRATION, [build.id]] }
+    Build.where(stage_id: nil)
+      .find_in_batches(batch_size: BATCH_SIZE)
+      .with_index do |builds, batch|
+        migrations = builds.map { |build| [MIGRATION, [build.id]] }
 
-      BackgroundMigrationWorker.perform_bulk(*migrations)
-    end
+        BackgroundMigrationWorker.perform_bulk(*migrations)
+      end
   end
 
   def down