diff --git a/store/sqlstore/job_store.go b/store/sqlstore/job_store.go
index 1aebd0153d..12ffad2654 100644
--- a/store/sqlstore/job_store.go
+++ b/store/sqlstore/job_store.go
@@ -37,6 +37,7 @@ func newSqlJobStore(sqlStore *SqlStore) store.JobStore {
 
 func (jss SqlJobStore) createIndexesIfNotExists() {
 	jss.CreateIndexIfNotExists("idx_jobs_type", "Jobs", "Type")
+	jss.CreateCompositeIndexIfNotExists("idx_jobs_status_type", "Jobs", []string{"Status", "Type"})
 }
 
 func (jss SqlJobStore) Save(job *model.Job) (*model.Job, error) {
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 0d6232653e..6fd4c7c76e 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -1347,6 +1347,7 @@ func upgradeDatabaseToVersion610(sqlStore *SqlStore) {
 	sqlStore.AlterColumnTypeIfExists("Sessions", "Roles", "text", "varchar(256)")
 	sqlStore.AlterColumnTypeIfExists("ChannelMembers", "Roles", "text", "varchar(256)")
 	sqlStore.AlterColumnTypeIfExists("TeamMembers", "Roles", "text", "varchar(256)")
+	sqlStore.CreateCompositeIndexIfNotExists("idx_jobs_status_type", "Jobs", []string{"Status", "Type"})
 
 	// saveSchemaVersion(sqlStore, Version610)
 	// }