diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 43688a7332..1e304f3d7d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -191,6 +191,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <param name="hitObject"></param>
         public virtual void Apply(HitObject hitObject)
         {
+            if (HitObject != null)
+                FreeAfterUse();
+
             HitObject = hitObject;
 
             // Copy any existing result from the hitobject (required for rewind / judgement revert).