diff --git a/osu.Game/Database/RealmContextFactory.cs b/osu.Game/Database/RealmContextFactory.cs
index d7e35f736e..35ff91adb2 100644
--- a/osu.Game/Database/RealmContextFactory.cs
+++ b/osu.Game/Database/RealmContextFactory.cs
@@ -1,6 +1,3 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
 using System;
 using System.Threading;
 using osu.Framework.Graphics;
@@ -77,7 +74,7 @@ namespace osu.Game.Database
         {
             base.Update();
 
-            if (Context.Refresh())
+            if (context?.Refresh() == true)
                 refreshes.Value++;
         }
 
@@ -107,8 +104,7 @@ namespace osu.Game.Database
         {
             base.Dispose(isDisposing);
 
-            context?.Dispose();
-            context = null;
+            FlushConnections();
         }
 
         /// <summary>
@@ -152,5 +148,14 @@ namespace osu.Game.Database
                 pending_writes.Value--;
             }
         }
+
+        public void FlushConnections()
+        {
+            var previousContext = context;
+            context = null;
+            previousContext?.Dispose();
+            while (previousContext?.IsClosed == false)
+                Thread.Sleep(50);
+        }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 759be79045..4bd4a6ae7f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -513,6 +513,7 @@ namespace osu.Game
         public void Migrate(string path)
         {
             contextFactory.FlushConnections();
+            realmFactory.FlushConnections();
             (Storage as OsuStorage)?.Migrate(Host.GetStorage(path));
         }
     }