diff --git a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
index 50090b7035..8992211ace 100644
--- a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
@@ -141,6 +141,7 @@ namespace osu.Game.Screens.Edit
         {
             if (Skin.BeatmapSetResources != null)
                 Skin.BeatmapSetResources.CacheInvalidated -= InvokeSkinChanged;
+            Skin.Dispose();
         }
 
         #region Delegated ISkin implementation
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 8c287a010e..3affd5afa6 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -342,6 +342,7 @@ namespace osu.Game.Skinning
 
             Textures?.Dispose();
             Samples?.Dispose();
+            FallbackStore?.Dispose();
 
             store.Dispose();
         }