diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d9f9e2de42..cf39c03f9d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -302,7 +302,8 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            Storage = new OsuStorage(host);
+            if (Storage == null) // may be non-null for certain tests
+                Storage = new OsuStorage(host);
 
             if (LocalConfig == null)
                 LocalConfig = new OsuConfigManager(Storage);