diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 3780f2b9cc..3523d18f29 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -74,24 +74,26 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Export te model corresponding to uuid to given stream.
+        /// Export te model corresponding to model to given stream.
         /// </summary>
-        /// <param name="uuid">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
+        /// <param name="model">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
         /// <param name="stream">The stream to export.</param>
         /// <returns></returns>
-        public virtual async Task ExportToStreamAsync(TModel uuid, Stream stream)
+        public async Task ExportToStreamAsync(TModel model, Stream stream)
         {
-            Guid id = uuid.ID;
+            Guid id = model.ID;
             await Task.Run(() =>
             {
                 RealmAccess.Run(r =>
                 {
-                    TModel model = r.Find<TModel>(id);
-                    createZipArchive(model, stream);
+                    TModel refetchModel = r.Find<TModel>(id);
+                    ExportToStream(refetchModel, stream);
                 });
             }).ContinueWith(OnComplete);
         }
 
+        protected virtual void ExportToStream(TModel model, Stream outputStream) => createZipArchive(model, outputStream);
+
         private void createZipArchive(TModel model, Stream outputStream)
         {
             using (var archive = ZipArchive.Create())
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index ae0fbf8d19..eb46bc6db2 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -3,7 +3,6 @@
 
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Overlays;
@@ -20,22 +19,14 @@ namespace osu.Game.Database
 
         protected override string FileExtension => ".osr";
 
-        public override async Task ExportToStreamAsync(ScoreInfo uuid, Stream stream)
+        protected override void ExportToStream(ScoreInfo model, Stream stream)
         {
-            await Task.Run(() =>
-            {
-                RealmAccess.Run(r =>
-                {
-                    ScoreInfo model = r.Find<ScoreInfo>(uuid.ID);
+            var file = model.Files.SingleOrDefault();
+            if (file == null)
+                return;
 
-                    var file = model.Files.SingleOrDefault();
-                    if (file == null)
-                        return;
-
-                    using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-                        inputStream.CopyTo(stream);
-                });
-            }).ContinueWith(OnComplete);
+            using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                inputStream.CopyTo(stream);
         }
     }
 }