diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index ad2be7d813..dc90e819d4 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -132,9 +132,10 @@ namespace osu.Game.Scoring
/// The total score.
public async Task GetTotalScoreAsync([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised, CancellationToken cancellationToken = default)
{
- // TODO: ??
- // if (score.Beatmap == null)
- // return score.TotalScore;
+ // TODO: This is required for playlist aggregate scores. They should likely not be getting here in the first place.
+ // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+ if (score.BeatmapInfo == null)
+ return score.TotalScore;
int beatmapMaxCombo;
double accuracy = score.Accuracy;