diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index fe2caaa0b7..31c365b478 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -462,9 +462,7 @@ namespace osu.Game.Database
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
                 {
-                    // Workaround System.InvalidOperationException
-                    // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                    file.FileInfo = usage.Context.FileInfo.Find(file.FileInfoID);
+                    file.Requery(usage.Context);
 
                     Files.Dereference(file.FileInfo);
 
diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 1d5c98ed8d..8ac05f78e0 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -49,18 +49,23 @@ namespace osu.Game.Database
                 default:
                     throw new ArgumentException($"{nameof(Requery)} does not have support for the provided model type", nameof(model));
             }
+
+            void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+            {
+                var dbContext = databaseContextFactory.Get();
+
+                foreach (var file in files)
+                {
+                    Requery(file, dbContext);
+                }
+            }
         }
 
-        private static void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        public static void Requery(this INamedFileInfo file, OsuDbContext dbContext)
         {
-            var dbContext = databaseContextFactory.Get();
-
-            foreach (var file in files)
-            {
-                // Workaround System.InvalidOperationException
-                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
         }
     }
 }