diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 041df3e6ff..c32e359de6 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -852,39 +852,6 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
-        [Test]
-        public async Task TestItemRemovedShouldPassConsumableBeatmapSet()
-        {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
-            {
-                try
-                {
-                    var osu = LoadOsuIntoHost(host);
-                    var manager = osu.Dependencies.Get<BeatmapManager>();
-
-                    var removedQueue = new Queue<BeatmapSetInfo>();
-                    manager.ItemRemoved.BindValueChanged(evt =>
-                    {
-                        if (evt.NewValue.TryGetTarget(out var target))
-                            removedQueue.Enqueue(target);
-                    });
-
-                    var imported = await LoadOszIntoOsu(osu);
-                    deleteBeatmapSet(imported, osu);
-
-                    Assert.That(removedQueue.Count, Is.EqualTo(1));
-
-                    var removedItem = removedQueue.Single();
-                    Assert.That(removedItem.Metadata, Is.EqualTo(imported.Metadata));
-                    Assert.That(removedItem.Beatmaps, Is.EquivalentTo(imported.Beatmaps));
-                }
-                finally
-                {
-                    host.Exit();
-                }
-            }
-        }
-
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index b9f805ae31..81d8668196 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Database
 
         protected readonly IDatabaseContextFactory ContextFactory;
 
-        protected readonly MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> ModelStore;
+        protected readonly MutableDatabaseBackedStore<TModel> ModelStore;
 
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ArchiveImportIPCChannel ipc;
@@ -491,7 +491,7 @@ namespace osu.Game.Database
             using (ContextFactory.GetForWrite())
             {
                 // re-fetch the model on the import context.
-                var foundModel = ModelStore.ConsumableItems.SingleOrDefault(i => i.ID == item.ID);
+                var foundModel = queryModel().Include(s => s.Files).ThenInclude(f => f.FileInfo).FirstOrDefault(s => s.ID == item.ID);
 
                 if (foundModel == null || foundModel.DeletePending) return false;
 
@@ -730,6 +730,8 @@ namespace osu.Game.Database
                 yield return f.Filename;
         }
 
+        private DbSet<TModel> queryModel() => ContextFactory.Get().Set<TModel>();
+
         protected virtual string HumanisedModelName => $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
 
         #region Event handling / delaying