diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index f50acb4802..56302acafe 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Input
         public KeyBindingStore(SQLiteConnection connection, RulesetStore rulesets, Storage storage = null)
             : base(connection, storage)
         {
-            foreach (var info in rulesets.Query<RulesetInfo>())
+            foreach (var info in rulesets.AllRulesets)
             {
                 var ruleset = info.CreateInstance();
                 foreach (var variant in ruleset.AvailableVariants)
diff --git a/osu.Game/Overlays/KeyBindingOverlay.cs b/osu.Game/Overlays/KeyBindingOverlay.cs
index 7d6ef7ffa6..827d361099 100644
--- a/osu.Game/Overlays/KeyBindingOverlay.cs
+++ b/osu.Game/Overlays/KeyBindingOverlay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays
         {
             AddSection(new GlobalKeyBindingsSection(global, "Global"));
 
-            foreach (var ruleset in rulesets.Query<RulesetInfo>())
+            foreach (var ruleset in rulesets.AllRulesets)
                 AddSection(new RulesetBindingsSection(ruleset));
         }