diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index de8f316b06..d6b8ad3e67 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -207,6 +207,7 @@ namespace osu.Game
             FileStore.Cleanup();
 
             AddInternal(API);
+            AddInternal(RulesetConfigCache);
 
             GlobalActionContainer globalBinding;
 
diff --git a/osu.Game/Rulesets/RulesetConfigCache.cs b/osu.Game/Rulesets/RulesetConfigCache.cs
index 8c9e3c94e2..cdcd2666cf 100644
--- a/osu.Game/Rulesets/RulesetConfigCache.cs
+++ b/osu.Game/Rulesets/RulesetConfigCache.cs
@@ -36,5 +36,14 @@ namespace osu.Game.Rulesets
 
             return configCache.GetOrAdd(ruleset.RulesetInfo.ID.Value, _ => ruleset.CreateConfig(settingsStore));
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            // ensures any potential database operations are finalised before game destruction.
+            foreach (var c in configCache.Values)
+                (c as IDisposable)?.Dispose();
+        }
     }
 }