diff --git a/db/migrate/20181106135939_add_index_to_deployments.rb b/db/migrate/20181106135939_add_index_to_deployments.rb
index 0b840999de33394627ec65f42ae0e634bfadcbe4..dc9a053d21c80cd42e6792557c827ff7375c8534 100644
--- a/db/migrate/20181106135939_add_index_to_deployments.rb
+++ b/db/migrate/20181106135939_add_index_to_deployments.rb
@@ -10,6 +10,7 @@ class AddIndexToDeployments < ActiveRecord::Migration
   def up
     add_concurrent_index :deployments, [:project_id, :status, :id]
     add_concurrent_index :deployments, [:project_id, :status, :iid]
+    add_concurrent_index :deployments, [:project_id, :status, :created_at]
     add_concurrent_index :deployments, [:environment_id, :status, :id]
     add_concurrent_index :deployments, [:environment_id, :status, :iid]
     add_concurrent_index :deployments, [:environment_id, :sha]
@@ -18,6 +19,7 @@ class AddIndexToDeployments < ActiveRecord::Migration
   def down
     remove_concurrent_index :deployments, [:project_id, :status, :id]
     remove_concurrent_index :deployments, [:project_id, :status, :iid]
+    remove_concurrent_index :deployments, [:project_id, :status, :created_at]
     remove_concurrent_index :deployments, [:environment_id, :status, :id]
     remove_concurrent_index :deployments, [:environment_id, :status, :iid]
     remove_concurrent_index :deployments, [:environment_id, :sha]
diff --git a/db/schema.rb b/db/schema.rb
index bbd52af36af88b68f2e4d4e6ccb95058cd037a0e..cb46083cea09817356c0e58e84935f6d37b9a955 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -839,6 +839,7 @@ ActiveRecord::Schema.define(version: 20181107054254) do
   add_index "deployments", ["environment_id", "status"], name: "index_deployments_on_environment_id_and_status", using: :btree
   add_index "deployments", ["id"], name: "partial_index_deployments_for_legacy_successful_deployments", where: "((finished_at IS NULL) AND (status = 2))", using: :btree
   add_index "deployments", ["project_id", "iid"], name: "index_deployments_on_project_id_and_iid", unique: true, using: :btree
+  add_index "deployments", ["project_id", "status", "created_at"], name: "index_deployments_on_project_id_and_status_and_created_at", using: :btree
   add_index "deployments", ["project_id", "status", "id"], name: "index_deployments_on_project_id_and_status_and_id", using: :btree
   add_index "deployments", ["project_id", "status", "iid"], name: "index_deployments_on_project_id_and_status_and_iid", using: :btree
   add_index "deployments", ["project_id", "status"], name: "index_deployments_on_project_id_and_status", using: :btree