diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 9b3548912c..d2428b0ccf 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -21,8 +21,9 @@ namespace osu.Game.Skinning
         protected override bool AllowManiaSkin => false;
         protected override bool UseCustomSampleBanks => true;
 
-        public LegacyBeatmapSkin(BeatmapInfo beatmapInfo, IStorageResourceProvider resources, [CanBeNull] IResourceStore<byte[]> storage = null)
-            : base(createSkinInfo(beatmapInfo), storage ?? new RealmBackedResourceStore(beatmapInfo.BeatmapSet, resources.Files), resources, beatmapInfo.Path)
+        public LegacyBeatmapSkin(BeatmapInfo beatmapInfo, [CanBeNull] IStorageResourceProvider resources, [CanBeNull] IResourceStore<byte[]> storage = null)
+            : base(createSkinInfo(beatmapInfo), storage ?? (resources != null ? new RealmBackedResourceStore(beatmapInfo.BeatmapSet, resources.Files, new[] { @"ogg" }) : null), resources,
+                beatmapInfo.Path)
         {
             // Disallow default colours fallback on beatmap skins to allow using parent skin combo colours. (via SkinProvidingContainer)
             Configuration.AllowDefaultComboColoursFallback = false;
diff --git a/osu.Game/Skinning/RealmBackedResourceStore.cs b/osu.Game/Skinning/RealmBackedResourceStore.cs
index 93ffbe4f44..fc9036727f 100644
--- a/osu.Game/Skinning/RealmBackedResourceStore.cs
+++ b/osu.Game/Skinning/RealmBackedResourceStore.cs
@@ -13,9 +13,16 @@ namespace osu.Game.Skinning
     {
         private readonly Dictionary<string, string> fileToStoragePathMapping = new Dictionary<string, string>();
 
-        public RealmBackedResourceStore(IHasRealmFiles source, IResourceStore<byte[]> underlyingStore)
+        public RealmBackedResourceStore(IHasRealmFiles source, IResourceStore<byte[]> underlyingStore, string[] extensions = null)
             : base(underlyingStore)
         {
+            // Must be initialised before the file cache.
+            if (extensions != null)
+            {
+                foreach (string extension in extensions)
+                    AddExtension(extension);
+            }
+
             initialiseFileCache(source);
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index a47da70cd6..654c4e75f7 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -60,25 +60,22 @@ namespace osu.Game.Skinning
                 {
                     SkinInfo = skin.ToLive(resources.RealmAccess);
 
-                    if (storage == null)
-                    {
-                        var realmStorage = new RealmBackedResourceStore(skin, resources.Files);
-                        realmStorage.AddExtension("ogg");
-
-                        storage = realmStorage;
-                    }
+                    storage ??= new RealmBackedResourceStore(skin, resources.Files, new[] { @"ogg" });
                 }
                 else
                 {
                     SkinInfo = skin.ToLiveUnmanaged();
                 }
 
-                var samples = resources.AudioManager?.GetSampleStore(storage);
-                if (samples != null)
-                    samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
+                if (storage != null)
+                {
+                    var samples = resources.AudioManager?.GetSampleStore(storage);
+                    if (samples != null)
+                        samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
 
-                Samples = samples;
-                Textures = new TextureStore(resources.CreateTextureLoaderStore(storage));
+                    Samples = samples;
+                    Textures = new TextureStore(resources.CreateTextureLoaderStore(storage));
+                }
             }
 
             configurationStream ??= storage?.GetStream(@"skin.ini");