diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 363a6e73461e..2686dfb3cff9 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -354,6 +354,8 @@ var migrations = []Migration{
 	NewMigration("No-op (remote version is using AppState now)", addRemoteVersionTableNoop),
 	// v200 -> v201
 	NewMigration("Add table app_state", addTableAppState),
+	// v201 -> v202
+	NewMigration("Drop table remote_version (if exists)", dropTableRemoteVersion),
 }
 
 // GetCurrentDBVersion returns the current db version
diff --git a/models/migrations/v201.go b/models/migrations/v201.go
new file mode 100644
index 000000000000..637c30617c84
--- /dev/null
+++ b/models/migrations/v201.go
@@ -0,0 +1,15 @@
+// Copyright 2021 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 (
+	"xorm.io/xorm"
+)
+
+func dropTableRemoteVersion(x *xorm.Engine) error {
+	// drop the orphaned table introduced in `v199`, now the update checker also uses AppState, do not need this table
+	_ = x.DropTables("remote_version")
+	return nil
+}