diff --git a/db/post_migrate/20210909104800_reschedule_extract_project_topics_into_separate_table_2.rb b/db/post_migrate/20210909104800_reschedule_extract_project_topics_into_separate_table_2.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ad31a40f324848e9c2a1444f65d143f43d38b506
--- /dev/null
+++ b/db/post_migrate/20210909104800_reschedule_extract_project_topics_into_separate_table_2.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RescheduleExtractProjectTopicsIntoSeparateTable2 < Gitlab::Database::Migration[1.0]
+  MIGRATION = 'ExtractProjectTopicsIntoSeparateTable'
+  DELAY_INTERVAL = 4.minutes
+
+  disable_ddl_transaction!
+
+  def up
+    requeue_background_migration_jobs_by_range_at_intervals(MIGRATION, DELAY_INTERVAL)
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema_migrations/20210909104800 b/db/schema_migrations/20210909104800
new file mode 100644
index 0000000000000000000000000000000000000000..70ad28d72b85b1a95f37a9953a41cbd040bf2a4a
--- /dev/null
+++ b/db/schema_migrations/20210909104800
@@ -0,0 +1 @@
+834825de758314db01a3daa2d2b943c11751553705c4dd078f2087b9ec6ff7f7
\ No newline at end of file
diff --git a/lib/gitlab/background_migration/extract_project_topics_into_separate_table.rb b/lib/gitlab/background_migration/extract_project_topics_into_separate_table.rb
index c5beb5a686537e382f3f39a54992806a043af242..31b5b5cdb7324d496218e26ca5f4d3d44867c6ec 100644
--- a/lib/gitlab/background_migration/extract_project_topics_into_separate_table.rb
+++ b/lib/gitlab/background_migration/extract_project_topics_into_separate_table.rb
@@ -33,11 +33,15 @@ class Project < ActiveRecord::Base
 
       def perform(start_id, stop_id)
         Tagging.includes(:tag).where(taggable_type: 'Project', id: start_id..stop_id).each do |tagging|
-          if Project.exists?(id: tagging.taggable_id)
-            topic = Topic.find_or_create_by(name: tagging.tag.name)
-            project_topic = ProjectTopic.find_or_create_by(project_id: tagging.taggable_id, topic: topic)
-
-            tagging.delete if project_topic.persisted?
+          if Project.exists?(id: tagging.taggable_id) && tagging.tag
+            begin
+              topic = Topic.find_or_create_by(name: tagging.tag.name)
+              project_topic = ProjectTopic.find_or_create_by(project_id: tagging.taggable_id, topic: topic)
+
+              tagging.delete if project_topic.persisted?
+            rescue StandardError => e
+              Gitlab::ErrorTracking.log_exception(e, tagging_id: tagging.id)
+            end
           else
             tagging.delete
           end
diff --git a/spec/lib/gitlab/background_migration/extract_project_topics_into_separate_table_spec.rb b/spec/lib/gitlab/background_migration/extract_project_topics_into_separate_table_spec.rb
index 05f40ee2501d81c9dd41690611531ccc25bd1b21..a111007a984e79b1b00323694f71f6bedcae6167 100644
--- a/spec/lib/gitlab/background_migration/extract_project_topics_into_separate_table_spec.rb
+++ b/spec/lib/gitlab/background_migration/extract_project_topics_into_separate_table_spec.rb
@@ -22,8 +22,9 @@
     other_tagging = taggings.create!(taggable_type: 'Other', taggable_id: project.id, context: 'topics', tag_id: tag_1.id)
     tagging_3 = taggings.create!(taggable_type: 'Project', taggable_id: project.id, context: 'topics', tag_id: tag_3.id)
     tagging_4 = taggings.create!(taggable_type: 'Project', taggable_id: -1, context: 'topics', tag_id: tag_1.id)
+    tagging_5 = taggings.create!(taggable_type: 'Project', taggable_id: project.id, context: 'topics', tag_id: -1)
 
-    subject.perform(tagging_1.id, tagging_4.id)
+    subject.perform(tagging_1.id, tagging_5.id)
 
     # Tagging records
     expect { tagging_1.reload }.to raise_error(ActiveRecord::RecordNotFound)
@@ -31,6 +32,7 @@
     expect { other_tagging.reload }.not_to raise_error(ActiveRecord::RecordNotFound)
     expect { tagging_3.reload }.to raise_error(ActiveRecord::RecordNotFound)
     expect { tagging_4.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    expect { tagging_5.reload }.to raise_error(ActiveRecord::RecordNotFound)
 
     # Topic records
     topic_1 = topics.find_by(name: 'Topic1')