diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 138182c7c4..22b028906f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -36,41 +36,41 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
         }
 
-        [TestCase(true, true, true)]
-        [TestCase(true, false, true)]
-        [TestCase(false, true, true)]
-        [TestCase(false, false, true)]
-        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true, true)]
+        [TestCase(true, false)]
+        [TestCase(false, true)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, true);
             AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
-        [TestCase(true, false)]
-        [TestCase(false, false)]
-        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, false);
             AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
-        [TestCase(true, false)]
-        [TestCase(false, false)]
-        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, false);
             AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 3232a30110..ae9a84932a 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -80,30 +80,28 @@ namespace osu.Game.Skinning
                         switch (global)
                         {
                             case GlobalSkinColours.ComboColours:
-                                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                                if (bindable != null && AllowColourLookup)
-                                    return bindable;
-                                else
-                                    return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+                                return getBindable<TLookup, TValue>(lookup, AllowColourLookup);
                         }
 
                         break;
 
                     default:
-                        if (AllowConfigurationLookup)
-                        {
-                            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                            if (bindable != null)
-                                return bindable;
-                        }
-
-                        break;
+                        return getBindable<TLookup, TValue>(lookup, AllowConfigurationLookup);
                 }
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
+        private IBindable<TValue> getBindable<TLookup, TValue>(TLookup lookup, bool bindableReturnCheck)
+        {
+            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+            if (bindable != null && bindableReturnCheck)
+                return bindable;
+            else
+                return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+        }
+
         protected virtual void TriggerSourceChanged() => SourceChanged?.Invoke();
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)