diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 8c73806cb5..4221ab93f1 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -597,6 +597,17 @@ public static double ComputeAccuracy(ScoreInfo scoreInfo)
             return maxBaseScore == 0 ? 1 : baseScore / (double)maxBaseScore;
         }
 
+        public static ScoreRank ComputeRank(ScoreInfo scoreInfo)
+        {
+            Ruleset ruleset = scoreInfo.Ruleset.CreateInstance();
+            var rank = ruleset.CreateScoreProcessor().RankFromScore(scoreInfo.Accuracy, scoreInfo.Statistics);
+
+            foreach (var mod in scoreInfo.Mods.OfType<IApplicableToScoreProcessor>())
+                rank = mod.AdjustRank(rank, scoreInfo.Accuracy);
+
+            return rank;
+        }
+
         /// <summary>
         /// Used to populate the <paramref name="score"/> model using data parsed from its corresponding replay file.
         /// </summary>
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 3d671d80c3..be704ca18b 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -40,7 +40,6 @@ public Score Parse(Stream stream)
             };
 
             WorkingBeatmap workingBeatmap;
-            byte[] compressedScoreInfo = null;
 
             using (SerializationReader sr = new SerializationReader(stream))
             {
@@ -109,6 +108,8 @@ public Score Parse(Stream stream)
                 else if (version >= 20121008)
                     scoreInfo.LegacyOnlineID = sr.ReadInt32();
 
+                byte[] compressedScoreInfo = null;
+
                 if (version >= 30000001)
                     compressedScoreInfo = sr.ReadByteArray();
 
@@ -133,11 +134,8 @@ public Score Parse(Stream stream)
             }
 
             PopulateMaximumStatistics(score.ScoreInfo, workingBeatmap);
-
-            if (score.ScoreInfo.IsLegacyScore || compressedScoreInfo == null)
-                PopulateLegacyAccuracyAndRank(score.ScoreInfo);
-            else
-                populateLazerAccuracyAndRank(score.ScoreInfo);
+            score.ScoreInfo.Accuracy = StandardisedScoreMigrationTools.ComputeAccuracy(score.ScoreInfo);
+            score.ScoreInfo.Rank = StandardisedScoreMigrationTools.ComputeRank(score.ScoreInfo);
 
             // before returning for database import, we must restore the database-sourced BeatmapInfo.
             // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.