diff --git a/db/migrate/20200429095034_add_topic_thumbnail_information.rb b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
index ee48265c6d8..2902d7730d9 100644
--- a/db/migrate/20200429095034_add_topic_thumbnail_information.rb
+++ b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
@@ -16,6 +16,16 @@ class AddTopicThumbnailInformation < ActiveRecord::Migration[6.0]
       ADD COLUMN IF NOT EXISTS image_upload_id bigint
     SQL
 
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS
+      index_posts_on_image_upload_id ON posts USING btree (image_upload_id);
+    SQL
+
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS
+      index_topics_on_image_upload_id ON public.topics USING btree (image_upload_id);
+    SQL
+
     ActiveRecord::Base.transaction do
       add_column :theme_modifier_sets, :topic_thumbnail_sizes, :string, array: true