diff --git a/osu.Game/Beatmaps/BeatmapStore.cs b/osu.Game/Beatmaps/BeatmapStore.cs
index 8eac35a667..6451862824 100644
--- a/osu.Game/Beatmaps/BeatmapStore.cs
+++ b/osu.Game/Beatmaps/BeatmapStore.cs
@@ -66,6 +66,7 @@ public bool Delete(BeatmapSetInfo beatmapSet)
             if (beatmapSet.DeletePending) return false;
 
             beatmapSet.DeletePending = true;
+            context.Update(beatmapSet);
             context.SaveChanges();
 
             BeatmapSetRemoved?.Invoke(beatmapSet);
@@ -84,6 +85,7 @@ public bool Undelete(BeatmapSetInfo beatmapSet)
             if (!beatmapSet.DeletePending) return false;
 
             beatmapSet.DeletePending = false;
+            context.Update(beatmapSet);
             context.SaveChanges();
 
             BeatmapSetAdded?.Invoke(beatmapSet);
@@ -137,7 +139,7 @@ public override void Cleanup()
 
             // metadata is M-N so we can't rely on cascades
             context.BeatmapMetadata.RemoveRange(purgeable.Select(s => s.Metadata));
-            context.BeatmapMetadata.RemoveRange(purgeable.SelectMany(s => s.Beatmaps.Select(b => b.Metadata)));
+            context.BeatmapMetadata.RemoveRange(purgeable.SelectMany(s => s.Beatmaps.Select(b => b.Metadata).Where(m => m != null)));
 
             // todo: we can probably make cascades work here with a FK in BeatmapDifficulty. just make to make it work correctly.
             context.BeatmapDifficulty.RemoveRange(purgeable.SelectMany(s => s.Beatmaps.Select(b => b.BaseDifficulty)));