diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
index ce1cab3b9b..82417d09a7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
@@ -19,14 +19,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("Create smoke", () =>
             {
-                SetContents(_ =>
+                SetContents(_ => new SmokingInputManager
                 {
-                    return new SmokingInputManager
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Size = new Vector2(0.95f),
-                        Child = new TestSmokeContainer { RelativeSizeAxes = Axes.Both },
-                    };
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(0.95f),
+                    Child = new TestSmokeContainer { RelativeSizeAxes = Axes.Both },
                 });
             });
         }
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 449dd920d6..e139e16ff2 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -48,8 +49,11 @@ namespace osu.Game.Rulesets.Osu.UI
                 isSmoking = false;
                 SmokeEnded?.Invoke(Time.Current);
 
-                foreach (SkinnableDrawable skinnable in Children)
+                foreach (Drawable child in Children)
+                {
+                    var skinnable = (SkinnableDrawable)child;
                     skinnable.LifetimeEnd = skinnable.Drawable.LifetimeEnd;
+                }
             }
         }