diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index bbd1bb734f7..9ffcfb4df20 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -238,6 +238,8 @@ var migrations = []Migration{
 	NewMigration("change length of some repository columns", changeSomeColumnsLengthOfRepo),
 	// v91 -> v92
 	NewMigration("add index on owner_id of repository and type, review_id of comment", addIndexOnRepositoryAndComment),
+	// v92 -> v93
+	NewMigration("remove orphaned repository index statuses", removeLingeringIndexStatus),
 }
 
 // Migrate database to current version
diff --git a/models/migrations/v92.go b/models/migrations/v92.go
new file mode 100644
index 00000000000..090332f151f
--- /dev/null
+++ b/models/migrations/v92.go
@@ -0,0 +1,16 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"github.com/go-xorm/xorm"
+	"xorm.io/builder"
+)
+
+func removeLingeringIndexStatus(x *xorm.Engine) error {
+
+	_, err := x.Exec(builder.Delete(builder.NotIn("`repo_id`", builder.Select("`id`").From("`repository`"))).From("`repo_indexer_status`"))
+	return err
+}