diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index a115ab9841..2f3674642e 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
         {
             PlaylistItem item = new PlaylistItem
             {
-                ID = (Playlist.LastOrDefault()?.ID + 1) ?? 0,
+                ID = Playlist.Count == 0 ? 0 : Playlist.Max(p => p.ID) + 1
             };
 
             populateItemFromCurrent(item);