diff --git a/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs b/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs
index ad0e45ade3..143aaecb44 100644
--- a/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs
+++ b/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Modes.Osu.Objects
             result.Position = new Vector2(int.Parse(split[0]), int.Parse(split[1]));
             result.StartTime = double.Parse(split[2]);
             result.Sample = new HitSampleInfo {
-                Type = (SampleType)Math.Max(1, int.Parse(split[4])),
+                Type = (SampleType)int.Parse(split[4]),
                 Set = SampleSet.Soft,
             };
             result.NewCombo = combo;
diff --git a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
index c7e29b1cad..06d25f8cdd 100644
--- a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
@@ -55,7 +55,10 @@ namespace osu.Game.Modes.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sample = audio.Sample.Get($@"Gameplay/{(HitObject.Sample.Set).ToString().ToLower()}-hit{HitObject.Sample.Type.ToString().ToLower()}");
+            string hitType = (HitObject.Sample.Type == SampleType.None ? SampleType.Normal : HitObject.Sample.Type).ToString().ToLower();
+            string sampleSet = HitObject.Sample.Set.ToString().ToLower();
+
+            sample = audio.Sample.Get($@"Gameplay/{sampleSet}-hit{hitType}");
         }
 
         protected void PlaySample()