diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index ceacbd51a2..720cf51f2c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -27,15 +27,15 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("set dummy", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null));
 
             base.SetUpSteps();
+
+            // if we save a beatmap with a hash collision, things fall over.
+            // probably needs a more solid resolution in the future but this will do for now.
+            AddStep("make new beatmap unique", () => EditorBeatmap.Metadata.Title = Guid.NewGuid().ToString());
         }
 
         [Test]
         public void TestCreateNewBeatmap()
         {
-            // if we save a beatmap with a hash collision, things fall over.
-            // probably needs a more solid resolution in the future but this will do for now.
-            AddStep("make new beatmap unique", () => EditorBeatmap.Metadata.Title = Guid.NewGuid().ToString());
-
             AddStep("save beatmap", () => Editor.Save());
             AddAssert("new beatmap persisted", () => EditorBeatmap.BeatmapInfo.ID > 0);
         }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index c39b71b058..bbe2604216 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -427,11 +427,13 @@ namespace osu.Game.Database
             {
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
+                {
                     Files.Dereference(file.FileInfo);
 
-                // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
-                // Definitely can be removed once we rework the database backend.
-                usage.Context.Set<TFileModel>().Remove(file);
+                    // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
+                    // Definitely can be removed once we rework the database backend.
+                    usage.Context.Set<TFileModel>().Remove(file);
+                }
 
                 model.Files.Remove(file);
             }