diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8126b74418..4c6e9689d3 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -451,13 +451,13 @@ namespace osu.Game
 
         private void onBeatmapChanged(ValueChangedEvent<WorkingBeatmap> valueChangedEvent)
         {
-            if (!ThreadSafety.IsUpdateThread)
+            if (IsLoaded && !ThreadSafety.IsUpdateThread)
                 throw new InvalidOperationException("Global beatmap bindable must be changed from update thread.");
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
         {
-            if (!ThreadSafety.IsUpdateThread)
+            if (IsLoaded && !ThreadSafety.IsUpdateThread)
                 throw new InvalidOperationException("Global ruleset bindable must be changed from update thread.");
 
             if (r.NewValue?.Available != true)