diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index 7906a6012f..3d76184e09 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -34,11 +34,16 @@ public class SampleInfo
         /// </summary>
         public int Volume;
 
-        public virtual IEnumerable<string> LookupNames => new[]
+        public virtual IEnumerable<string> LookupNames
         {
-            $"{Namespace}/{Bank}-{Name}",
-            $"{Bank}-{Name}" // Without namespace as a fallback
-        };
+            get
+            {
+                if (!string.IsNullOrEmpty(Namespace))
+                    yield return $"{Namespace}/{Bank}-{Name}";
+
+                yield return $"{Bank}-{Name}"; // Without namespace as a fallback even when we have a namespace
+            }
+        }
 
         public SampleInfo Clone() => (SampleInfo)MemberwiseClone();
     }