diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
index 1c56227521..f069d3f384 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
@@ -235,7 +235,7 @@ private List<APIFriend> sortUsers(List<APIFriend> unsorted)
                     return unsorted.OrderByDescending(u => u.LastVisit).ToList();
 
                 case UserSortCriteria.Rank:
-                    return unsorted.Where(u => u.CurrentModeRank.HasValue).OrderBy(u => u.CurrentModeRank).Concat(unsorted.Where(u => u.CurrentModeRank == null)).ToList();
+                    return unsorted.OrderByDescending(u => u.CurrentModeRank.HasValue).ThenBy(u => u.CurrentModeRank ?? 0).ToList();
 
                 case UserSortCriteria.Username:
                     return unsorted.OrderBy(u => u.Username).ToList();