diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index a689590819..8ffade1e2b 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -98,8 +98,9 @@ namespace osu.Game.Scoring
             }
         }
 
-        [JsonIgnore]
-        public User User;
+        [NotMapped]
+        [JsonProperty("user")]
+        public User User { get; set; }
 
         [JsonIgnore]
         [Column("User")]
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 4b09349be5..2fbeea4377 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -102,20 +102,8 @@ namespace osu.Game.Screens.Multi.Match.Components
         Overall
     }
 
-    public class RoomScore
+    public class RoomScore : ScoreInfo
     {
-        [JsonProperty("user")]
-        public User User { get; set; }
-
-        [JsonProperty("accuracy")]
-        public double Accuracy { get; set; }
-
-        [JsonProperty("total_score")]
-        public int TotalScore { get; set; }
-
-        [JsonProperty("pp")]
-        public double? PP { get; set; }
-
         [JsonProperty("attempts")]
         public int TotalAttempts { get; set; }