diff --git a/src/GZCTF/Repositories/GameRepository.cs b/src/GZCTF/Repositories/GameRepository.cs
index 24fa441b5..1a4dbc3a7 100644
--- a/src/GZCTF/Repositories/GameRepository.cs
+++ b/src/GZCTF/Repositories/GameRepository.cs
@@ -178,6 +178,8 @@ public async Task<ScoreboardModel> GenScoreboard(Game game, CancellationToken to
                 .AsNoTracking()
                 .IgnoreAutoIncludes()
                 .Where(c => c.GameId == game.Id && c.IsEnabled)
+                .OrderBy(c => c.Tag)
+                .ThenBy(c => c.Title)
                 .Select(c => new ChallengeInfo
                 {
                     Id = c.Id,