diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/OsuTrianglesSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Default/OsuTrianglesSkinTransformer.cs
index 7a4c768aa2..69ef1d9dc0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/OsuTrianglesSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/OsuTrianglesSkinTransformer.cs
@@ -29,6 +29,28 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                             return new DefaultJudgementPieceSliderTickMiss(result);
                     }
 
+                    break;
+                case OsuSkinComponentLookup osuComponent:
+                    switch (osuComponent.Component)
+                    {
+                        case OsuSkinComponents.HitMarkerLeft:
+                            if (GetTexture(@"hitmarker-left") != null)
+                                return new HitMarker(OsuAction.LeftButton);
+
+                            return null;
+
+                        case OsuSkinComponents.HitMarkerRight:
+                            if (GetTexture(@"hitmarker-right") != null)
+                                return new HitMarker(OsuAction.RightButton);
+
+                            return null;
+
+                        case OsuSkinComponents.AimMarker:
+                            if (GetTexture(@"aimmarker") != null)
+                                return new HitMarker();
+                            
+                            return null;
+                    }
                     break;
             }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 84c055fe5e..a931d3ecbf 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -168,27 +167,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                             return new LegacyApproachCircle();
 
                         return null;
-
-                    case OsuSkinComponents.HitMarkerLeft:
-                        if (GetTexture(@"hitmarker-left") != null)
-                            return new HitMarker(OsuAction.LeftButton);
-
-                        return null;
-
-                    case OsuSkinComponents.HitMarkerRight:
-                        if (GetTexture(@"hitmarker-right") != null)
-                            return new HitMarker(OsuAction.RightButton);
-
-                        return null;
-
-                    case OsuSkinComponents.AimMarker:
-                        if (GetTexture(@"aimmarker") != null)
-                            return new HitMarker();
-                        
-                        return null;
-
-                    default:
-                        throw new UnsupportedSkinComponentException(lookup);
                 }
             }