diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index 9981e08442..8da285daa3 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Database
         {
             string itemFilename = GetFilename(item).GetValidFilename();
 
+            if (itemFilename.Length > MAX_FILENAME_LENGTH - FileExtension.Length)
+                itemFilename = itemFilename.Remove(MAX_FILENAME_LENGTH - FileExtension.Length);
+
             IEnumerable<string> existingExports =
                 exportStorage
                     .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
@@ -65,14 +68,6 @@ namespace osu.Game.Database
 
             string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
 
-            if (filename.Length > MAX_FILENAME_LENGTH)
-            {
-                string filenameWithoutExtension = Path.GetFileNameWithoutExtension(filename);
-
-                filenameWithoutExtension = filenameWithoutExtension.Remove(MAX_FILENAME_LENGTH - FileExtension.Length);
-                filename = $"{filenameWithoutExtension}{FileExtension}";
-            }
-
             using (var stream = exportStorage.CreateFileSafely(filename))
                 ExportModelTo(item, stream);