diff --git a/db/migrate/20170405112956_add_index_on_mentions_status_id.rb b/db/migrate/20170405112956_add_index_on_mentions_status_id.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3ed1a20cff0da671d6309b8170f37323f7ae643b
--- /dev/null
+++ b/db/migrate/20170405112956_add_index_on_mentions_status_id.rb
@@ -0,0 +1,5 @@
+class AddIndexOnMentionsStatusId < ActiveRecord::Migration[5.0]
+  def change
+    add_index :mentions, :status_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3aaa3e3ad7b5d6cd7cdb3b0fb03cb8654bf456b9..b5d55fa16e9e04e8beb2d54d1f3fe59f8966e3d5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170403172249) do
+ActiveRecord::Schema.define(version: 20170405112956) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -127,6 +127,7 @@ ActiveRecord::Schema.define(version: 20170403172249) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true, using: :btree
+    t.index ["status_id"], name: "index_mentions_on_status_id", using: :btree
   end
 
   create_table "mutes", force: :cascade do |t|