diff --git a/Shared/HighestGearScoreSystem/HighestGearScoreSystem.cs b/Shared/HighestGearScoreSystem/HighestGearScoreSystem.cs
index 1b5e6d3..0064212 100644
--- a/Shared/HighestGearScoreSystem/HighestGearScoreSystem.cs
+++ b/Shared/HighestGearScoreSystem/HighestGearScoreSystem.cs
@@ -50,6 +50,7 @@ public static void Save()
 		public static float GetCurrentOrHighestGearScore(FromCharacter fromCharacter)
 		{
 			var entityManager = VWorld.Server.EntityManager;
+			var currentGS = GetCurrentGearScore(fromCharacter, entityManager);
 			if(HighestGearScoreSystemConfig.HighestGearScoreSystemEnabled.Value)
 			{
 				PruneHighestGearScores();
@@ -57,10 +58,10 @@ public static float GetCurrentOrHighestGearScore(FromCharacter fromCharacter)
 				var user = entityManager.GetComponentData<User>(fromCharacter.User);
 				if(_gearScoreData.TryGetValue(user.PlatformId, out var gearScoreData))
 				{
-					return gearScoreData.HighestGearScore;
+					return Math.Max(currentGS, gearScoreData.HighestGearScore);
 				}
 			}
-			return GetCurrentGearScore(fromCharacter, entityManager);
+			return currentGS;
 		}
 
 		public static float GetCurrentGearScore(FromCharacter fromCharacter, EntityManager entityManager)