diff --git a/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs b/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
index 50b62cd6ed..8eb2952159 100644
--- a/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/API/Requests/SubmitRoomScoreRequest.cs
@@ -8,7 +8,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class SubmitRoomScoreRequest : APIRequest
+    public class SubmitRoomScoreRequest : APIRequest<RoomScore>
     {
         private readonly int scoreId;
         private readonly int roomId;
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index fbe9e3480f..cf0197d26b 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -97,22 +97,18 @@ namespace osu.Game.Screens.Multi.Play
         }
 
         protected override ScoreInfo CreateScore()
-        {
-            submitScore();
-            return base.CreateScore();
-        }
-
-        private void submitScore()
         {
             var score = base.CreateScore();
-
             score.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
 
             Debug.Assert(token != null);
 
             var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score);
+            request.Success += s => score.OnlineScoreID = s.ID;
             request.Failure += e => Logger.Error(e, "Failed to submit score");
             api.Queue(request);
+
+            return score;
         }
 
         protected override void Dispose(bool isDisposing)