diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index e220cad42a..3234cca0ac 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -251,10 +251,11 @@ namespace osu.Game.Skinning
             {
                 yield return CurrentSkin.Value;
 
-                if (CurrentSkin.Value is LegacySkin)
+                if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultLegacySkin)
                     yield return DefaultLegacySkin;
 
-                yield return DefaultSkin;
+                if (CurrentSkin.Value != DefaultSkin)
+                    yield return DefaultSkin;
             }
         }