diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs
index 7318a6d929..221d715a35 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         [TestCase("taiko-normal-hitnormal")]
         [TestCase("normal-hitnormal")]
-        // [TestCase("hitnormal")] intentionally broken (will play classic default instead).
+        [TestCase("hitnormal")]
         public void TestDefaultCustomSampleFromBeatmap(string expectedSample)
         {
             SetupSkins(expectedSample, expectedSample);
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         [TestCase("taiko-normal-hitnormal")]
         [TestCase("normal-hitnormal")]
-        // [TestCase("hitnormal")] intentionally broken (will play classic default instead).
+        [TestCase("hitnormal")]
         public void TestDefaultCustomSampleFromUserSkinFallback(string expectedSample)
         {
             SetupSkins(string.Empty, expectedSample);
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index e0557c8617..7ce0f6b93b 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -152,32 +152,35 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             throw new ArgumentOutOfRangeException(nameof(component), $"Invalid component type: {component}");
         }
 
-        public override ISample GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
+        public override ISample GetSample(ISampleInfo sampleInfo)
+        {
+            if (sampleInfo is HitSampleInfo hitSampleInfo)
+                return Source.GetSample(new LegacyTaikoSampleInfo(hitSampleInfo));
+
+            return base.GetSample(sampleInfo);
+        }
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Source.GetConfig<TLookup, TValue>(lookup);
 
-        private class LegacyTaikoSampleInfo : ISampleInfo
+        private class LegacyTaikoSampleInfo : HitSampleInfo
         {
-            private readonly ISampleInfo source;
+            public LegacyTaikoSampleInfo(HitSampleInfo sampleInfo)
+                : base(sampleInfo.Name, sampleInfo.Bank, sampleInfo.Suffix, sampleInfo.Volume)
 
-            public LegacyTaikoSampleInfo(ISampleInfo source)
             {
-                this.source = source;
             }
 
-            public IEnumerable<string> LookupNames
+            public override IEnumerable<string> LookupNames
             {
                 get
                 {
-                    foreach (var name in source.LookupNames)
+                    foreach (var name in base.LookupNames)
                         yield return name.Insert(name.LastIndexOf('/') + 1, "taiko-");
 
-                    foreach (var name in source.LookupNames)
+                    foreach (var name in base.LookupNames)
                         yield return name;
                 }
             }
-
-            public int Volume => source.Volume;
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 98cc5c8fd8..474ac1a794 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -519,7 +519,9 @@ namespace osu.Game.Skinning
                 var sample = Samples?.Get(lookup);
 
                 if (sample != null)
+                {
                     return sample;
+                }
             }
 
             return legacyDefaultFallback?.GetSample(sampleInfo);