diff --git a/osu.Game.Tests/Scores/IO/TestScoreEquality.cs b/osu.Game.Tests/Scores/IO/TestScoreEquality.cs
index 42fcb3acab..f898774ce6 100644
--- a/osu.Game.Tests/Scores/IO/TestScoreEquality.cs
+++ b/osu.Game.Tests/Scores/IO/TestScoreEquality.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using NUnit.Framework;
 using osu.Game.Scoring;
 
@@ -29,8 +30,8 @@ namespace osu.Game.Tests.Scores.IO
         [Test]
         public void TestNonMatchingByPrimaryKey()
         {
-            ScoreInfo score1 = new ScoreInfo { ID = 1 };
-            ScoreInfo score2 = new ScoreInfo { ID = 2 };
+            ScoreInfo score1 = new ScoreInfo { ID = Guid.NewGuid() };
+            ScoreInfo score2 = new ScoreInfo { ID = Guid.NewGuid() };
 
             Assert.That(score1, Is.Not.EqualTo(score2));
         }
@@ -38,8 +39,10 @@ namespace osu.Game.Tests.Scores.IO
         [Test]
         public void TestMatchingByPrimaryKey()
         {
-            ScoreInfo score1 = new ScoreInfo { ID = 1 };
-            ScoreInfo score2 = new ScoreInfo { ID = 1 };
+            Guid id = Guid.NewGuid();
+
+            ScoreInfo score1 = new ScoreInfo { ID = id };
+            ScoreInfo score2 = new ScoreInfo { ID = id };
 
             Assert.That(score1, Is.EqualTo(score2));
         }
diff --git a/osu.Game/Online/Solo/SubmittableScore.cs b/osu.Game/Online/Solo/SubmittableScore.cs
index 52aef82c3b..327806f390 100644
--- a/osu.Game/Online/Solo/SubmittableScore.cs
+++ b/osu.Game/Online/Solo/SubmittableScore.cs
@@ -11,7 +11,6 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
-using APIUser = osu.Game.Online.API.Requests.Responses.APIUser;
 
 namespace osu.Game.Online.Solo
 {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 544e8df425..4539409d4c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -490,7 +490,8 @@ namespace osu.Game
             if (score.OnlineID > 0)
                 databasedScoreInfo = ScoreManager.Query(s => s.OnlineID == score.OnlineID);
 
-            databasedScoreInfo ??= ScoreManager.Query(s => s.Hash == score.Hash);
+            if (score is ScoreInfo scoreInfo)
+                databasedScoreInfo ??= ScoreManager.Query(s => s.Hash == scoreInfo.Hash);
 
             if (databasedScoreInfo == null)
             {
diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index fc27261225..a11cd5fcbd 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Scoring.Legacy
     {
         public static int? GetCountGeki(this ScoreInfo scoreInfo)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 3:
                     return getCount(scoreInfo, HitResult.Perfect);
@@ -20,7 +20,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static void SetCountGeki(this ScoreInfo scoreInfo, int value)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 3:
                     scoreInfo.Statistics[HitResult.Perfect] = value;
@@ -34,7 +34,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static int? GetCountKatu(this ScoreInfo scoreInfo)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 3:
                     return getCount(scoreInfo, HitResult.Good);
@@ -48,7 +48,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static void SetCountKatu(this ScoreInfo scoreInfo, int value)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 3:
                     scoreInfo.Statistics[HitResult.Good] = value;
@@ -62,7 +62,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static int? GetCount100(this ScoreInfo scoreInfo)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 0:
                 case 1:
@@ -78,7 +78,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static void SetCount100(this ScoreInfo scoreInfo, int value)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 0:
                 case 1:
@@ -94,7 +94,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static int? GetCount50(this ScoreInfo scoreInfo)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 0:
                 case 3:
@@ -109,7 +109,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static void SetCount50(this ScoreInfo scoreInfo, int value)
         {
-            switch (scoreInfo.Ruleset?.ID ?? scoreInfo.RulesetID)
+            switch (scoreInfo.Ruleset.OnlineID)
             {
                 case 0:
                 case 3: