diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index b06c55102c..c81cfd97dd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             bool hitLightingEnabled = config.Get<bool>(OsuSetting.HitLighting);
 
-            if (hitLightingEnabled)
+            if (hitLightingEnabled && Lighting.Drawable != null)
             {
                 Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 45b3e229f3..c0fcb1eb3c 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -139,12 +139,14 @@ namespace osu.Game.Rulesets.Judgements
 
                     animatable.PlayAnimation();
 
-                    drawableAnimation.Expire(true);
-
                     // a derived version of DrawableJudgement may be adjusting lifetime.
                     // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
-                    if (LifetimeEnd == double.MaxValue || drawableAnimation.LifetimeEnd > LifetimeEnd)
-                        LifetimeEnd = drawableAnimation.LifetimeEnd;
+                    double lastTransformTime = drawableAnimation.LatestTransformEndTime;
+
+                    if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
+                    {
+                        LifetimeEnd = lastTransformTime;
+                    }
                 }
             }
         }