diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 67f91d3bdb..331764f274 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -69,13 +69,13 @@ namespace osu.Game.Database
 
         private async Task<StableStorage> getStableStorage()
         {
-            var stableStorage = game.GetStorageForStableInstall();
-            if (stableStorage != null)
-                return stableStorage;
-
             if (cachedStorage != null)
                 return cachedStorage;
 
+            var stableStorage = game.GetStorageForStableInstall();
+            if (stableStorage != null)
+                return cachedStorage = stableStorage;
+
             var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             Schedule(() => dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource)));
             var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);