diff --git a/CHANGELOG b/CHANGELOG
index 4fac555e12a627373a8206f6f1ccb5d49b6c814d..bda8c3d50bcf77ad53db3f22e871589a8cbf88f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.9.5 (unreleased)
   - Fix assigning shared runners as admins. !4961
   - Show "locked" label for locked runners on runners admin. !4961
   - Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
+  - Add index on the user and emoji name on AwardEmoji table !5061
   - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1
   - Fix import button disabled when import process fail due to the namespace already been taken.
   - Security: Update RedCloth to 4.3.2 (Takuya Noguchi)
diff --git a/db/migrate/20160703180340_add_index_on_award_emoji_user_and_name.rb b/db/migrate/20160703180340_add_index_on_award_emoji_user_and_name.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0c25f87dfb4b088d83d7711464fa2fbe576bb026
--- /dev/null
+++ b/db/migrate/20160703180340_add_index_on_award_emoji_user_and_name.rb
@@ -0,0 +1,11 @@
+# rubocop:disable all
+# Migration type: online without errors
+
+class AddIndexOnAwardEmojiUserAndName < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  def change
+    add_concurrent_index(:award_emoji, [:user_id, :name])
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0f5f9f243faa752413475d3c94aaf90837e9d86f..5b9ed985facaff324a562d3418f2b7a4e87edab3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160628085157) do
+ActiveRecord::Schema.define(version: 20160703180340) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -112,6 +112,7 @@ ActiveRecord::Schema.define(version: 20160628085157) do
   end
 
   add_index "award_emoji", ["awardable_type", "awardable_id"], name: "index_award_emoji_on_awardable_type_and_awardable_id", using: :btree
+  add_index "award_emoji", ["user_id", "name"], name: "index_award_emoji_on_user_id_and_name", using: :btree
   add_index "award_emoji", ["user_id"], name: "index_award_emoji_on_user_id", using: :btree
 
   create_table "broadcast_messages", force: :cascade do |t|