diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index a7c4790366..1143549f7f 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -110,10 +110,11 @@ namespace osu.Game.Rulesets.Difficulty
         private void preProcess(Mod[] mods)
         {
             playableMods = mods.Select(m => m.DeepClone()).ToArray();
-            Beatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, mods);
+
+            Beatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, playableMods);
 
             var track = new TrackVirtual(10000);
-            mods.OfType<IApplicableToTrack>().ForEach(m => m.ApplyToTrack(track));
+            playableMods.OfType<IApplicableToTrack>().ForEach(m => m.ApplyToTrack(track));
             clockRate = track.Rate;
         }
 
diff --git a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
index 2ae7b5660a..15d9f9517b 100644
--- a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
+++ b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Screens.Play.HUD
             Current.Value = DisplayedCount = 0;
         }
 
+        private Mod[] clonedMods;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
         {
@@ -67,8 +69,10 @@ namespace osu.Game.Screens.Play.HUD
 
             if (gameplayState != null)
             {
+                clonedMods = gameplayState.Mods.Select(m => m.DeepClone()).ToArray();
+
                 var gameplayWorkingBeatmap = new GameplayWorkingBeatmap(gameplayState.Beatmap);
-                difficultyCache.GetTimedDifficultyAttributesAsync(gameplayWorkingBeatmap, gameplayState.Ruleset, gameplayState.Mods.ToArray(), loadCancellationSource.Token)
+                difficultyCache.GetTimedDifficultyAttributesAsync(gameplayWorkingBeatmap, gameplayState.Ruleset, gameplayState.Mods.Select(m => m.DeepClone()).ToArray(), loadCancellationSource.Token)
                                .ContinueWith(r => Schedule(() =>
                                {
                                    timedAttributes = r.Result;
@@ -116,7 +120,11 @@ namespace osu.Game.Screens.Play.HUD
                 return;
             }
 
-            var calculator = gameplayState.Ruleset.CreatePerformanceCalculator(attrib, gameplayState.Score.ScoreInfo);
+            // awkward but we need to make sure the true mods are not passed to PerformanceCalculator as it makes a mess of track applications.
+            var scoreInfo = gameplayState.Score.ScoreInfo.DeepClone();
+            scoreInfo.Mods = clonedMods;
+
+            var calculator = gameplayState.Ruleset.CreatePerformanceCalculator(attrib, scoreInfo);
 
             Current.Value = (int)Math.Round(calculator?.Calculate() ?? 0, MidpointRounding.AwayFromZero);
             IsValid = true;