diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
index bf1274256b..9b2ea095d2 100644
--- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs
@@ -152,14 +152,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                     target = centreHit;
                     back = centre;
 
-                    drumSample.Centre.Play();
+                    drumSample.Centre?.Play();
                 }
                 else if (action == RimAction)
                 {
                     target = rimHit;
                     back = rim;
 
-                    drumSample.Rim.Play();
+                    drumSample.Rim?.Play();
                 }
 
                 if (target != null)
diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index 31acb8bc89..9597acd902 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -17,8 +17,18 @@ namespace osu.Game.Audio
 
         public SampleChannel GetChannel(SampleManager manager, string resourceNamespace = null)
         {
-            SampleChannel channel = manager.Get(Path.Combine("Gameplay", resourceNamespace ?? string.Empty, $"{Bank}-{Name}"));
-            channel.Volume.Value = Volume / 100.0;
+            SampleChannel channel = null;
+
+            if (resourceNamespace != null)
+                channel = manager.Get(Path.Combine("Gameplay", resourceNamespace, $"{Bank}-{Name}"));
+
+            // try without namespace as a fallback.
+            if (channel == null)
+                channel = manager.Get(Path.Combine("Gameplay", $"{Bank}-{Name}"));
+
+            if (channel != null)
+                channel.Volume.Value = Volume / 100.0;
+
             return channel;
         }