diff --git a/models/migrations/v68.go b/models/migrations/v68.go
index c03815a0f..b087144ff 100644
--- a/models/migrations/v68.go
+++ b/models/migrations/v68.go
@@ -190,8 +190,8 @@ func reformatAndRemoveIncorrectTopics(x *xorm.Engine) (err error) {
 	log.Info("Updating repositories 'topics' fields...")
 	for repoID := range touchedRepo {
 		if err := sess.Table("topic").Cols("name").
-			Join("INNER", "repo_topic", "topic.id = repo_topic.topic_id").
-			Where("repo_topic.repo_id = ?", repoID).Find(&topicNames); err != nil {
+			Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id").
+			Where("repo_topic.repo_id = ?", repoID).Desc("topic.repo_count").Find(&topicNames); err != nil {
 			return err
 		}
 		log.Info("Updating 'topics' field for repository with id = %v", repoID)
diff --git a/models/topic.go b/models/topic.go
index 247aac5ff..276d4d17c 100644
--- a/models/topic.go
+++ b/models/topic.go
@@ -192,8 +192,8 @@ func SaveTopics(repoID int64, topicNames ...string) error {
 
 	topicNames = topicNames[:0]
 	if err := sess.Table("topic").Cols("name").
-		Join("INNER", "repo_topic", "topic.id = repo_topic.topic_id").
-		Where("repo_topic.repo_id = ?", repoID).Find(&topicNames); err != nil {
+		Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id").
+		Where("repo_topic.repo_id = ?", repoID).Desc("topic.repo_count").Find(&topicNames); err != nil {
 		return err
 	}