diff --git a/ServerCore/Pages/Events/Standings.cshtml.cs b/ServerCore/Pages/Events/Standings.cshtml.cs
index 25ecec21..74a704e3 100644
--- a/ServerCore/Pages/Events/Standings.cshtml.cs
+++ b/ServerCore/Pages/Events/Standings.cshtml.cs
@@ -32,7 +32,7 @@ public async Task OnGetAsync(SortOrder? sort)
                     Team = g.Key,
                     SolveCount = g.Count(),
                     Score = g.Sum(s => s.Puzzle.SolveValue),
-                    FinalMetaSolveTime = g.Where(s => s.Puzzle.IsFinalPuzzle).Select(s => s.SolvedTime).FirstOrDefault()
+                    FinalMetaSolveTime = g.Where(s => s.Puzzle.IsFinalPuzzle).Select(s => s.SolvedTime).FirstOrDefault() ?? DateTime.MaxValue
                 })
                 .OrderBy(t => t.FinalMetaSolveTime).ThenByDescending(t => t.Score).ThenBy(t => t.Team.Name)
                 .ToListAsync();
@@ -47,7 +47,7 @@ public async Task OnGetAsync(SortOrder? sort)
                     Team = data.Team,
                     SolveCount = data.SolveCount,
                     Score = data.Score,
-                    FinalMetaSolveTime = data.FinalMetaSolveTime ?? DateTime.MaxValue
+                    FinalMetaSolveTime = data.FinalMetaSolveTime
                 };
 
                 if (prevStats == null || stats.FinalMetaSolveTime != prevStats.FinalMetaSolveTime || stats.Score != prevStats.Score)