diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index eab81186d5..d410fb6edf 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Difficulty
                 foreach (var skill in skills)
                     skill.ProcessInternal(hitObject);
 
-                attribs.Add(new TimedDifficultyAttributes(hitObject.EndTime, CreateDifficultyAttributes(progressiveBeatmap, playableMods, skills, clockRate)));
+                attribs.Add(new TimedDifficultyAttributes(hitObject.EndTime * clockRate, CreateDifficultyAttributes(progressiveBeatmap, playableMods, skills, clockRate)));
             }
 
             return attribs;
diff --git a/osu.Game/Rulesets/Difficulty/TimedDifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/TimedDifficultyAttributes.cs
index 973b2dacb2..28319ec6d7 100644
--- a/osu.Game/Rulesets/Difficulty/TimedDifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/TimedDifficultyAttributes.cs
@@ -11,7 +11,14 @@ namespace osu.Game.Rulesets.Difficulty
     /// </summary>
     public class TimedDifficultyAttributes : IComparable<TimedDifficultyAttributes>
     {
+        /// <summary>
+        /// The non-clock adjusted time value at which the attributes take effect.
+        /// </summary>
         public readonly double Time;
+
+        /// <summary>
+        /// The attributes.
+        /// </summary>
         public readonly DifficultyAttributes Attributes;
 
         public TimedDifficultyAttributes(double time, DifficultyAttributes attributes)
diff --git a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
index 09ca326cce..ef289c2a20 100644
--- a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
+++ b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
@@ -48,9 +48,6 @@ namespace osu.Game.Screens.Play.HUD
         [CanBeNull]
         private GameplayState gameplayState { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private GameplayClock gameplayClock { get; set; }
-
         [CanBeNull]
         private List<TimedDifficultyAttributes> timedAttributes;
 
@@ -136,12 +133,10 @@ namespace osu.Game.Screens.Play.HUD
         [CanBeNull]
         private DifficultyAttributes getAttributeAtTime(JudgementResult judgement)
         {
-            if (timedAttributes == null || timedAttributes.Count == 0 || gameplayClock == null)
+            if (timedAttributes == null || timedAttributes.Count == 0)
                 return null;
 
-            double judgementTime = judgement.HitObject.GetEndTime() / gameplayClock.TrueGameplayRate;
-
-            int attribIndex = timedAttributes.BinarySearch(new TimedDifficultyAttributes(judgementTime, null));
+            int attribIndex = timedAttributes.BinarySearch(new TimedDifficultyAttributes(judgement.HitObject.GetEndTime(), null));
             if (attribIndex < 0)
                 attribIndex = ~attribIndex - 1;