diff --git a/JustDanceEditor.UI/Converting/ConverterDialogue.cs b/JustDanceEditor.UI/Converting/ConverterDialogue.cs
index 88e49da..d810750 100644
--- a/JustDanceEditor.UI/Converting/ConverterDialogue.cs
+++ b/JustDanceEditor.UI/Converting/ConverterDialogue.cs
@@ -68,19 +68,21 @@ public static void ConvertAllSongsInFolder()
             string outputFolder = AskOutputFolder();
             ExportType exportType;
 
-            // First parse the cachingStatus.json
-            JDCacheJSON? cacheJSON = null;
+            List<string> existingSongs = [];
 
             string cacheStatusPath = Path.Combine(outputFolder, "SD_Cache.0000", "MapBaseCache", "cachingStatus.json");
             if (File.Exists(cacheStatusPath))
             {
                 string json = File.ReadAllText(cacheStatusPath);
-                cacheJSON = JsonSerializer.Deserialize<JDCacheJSON>(json);
+                existingSongs = JsonSerializer.Deserialize<JDCacheJSON>(json)!.MapsDict.Select(x => x.Value.SongDatabaseEntry.ParentMapId).ToList();
                 exportType = ExportType.OfflineCache;
             }
             else
             {
                 exportType = ExportType.CustomServer;
+                // Get all names in the output folder
+                string[] outputSongs = Directory.GetDirectories(outputFolder);
+                existingSongs = outputSongs.Select(Path.GetFileName).ToList()!;
             }
 
             bool onlineCover = AskOnlineCover();
@@ -117,7 +119,7 @@ public static void ConvertAllSongsInFolder()
                     }
 
                     // If the song is already cached, skip it
-                    if (cacheJSON != null && cacheJSON.MapsDict.Any(x => x.Value.SongDatabaseEntry.ParentMapId.Equals(song, StringComparison.OrdinalIgnoreCase)))
+                    if (existingSongs.Contains(song, StringComparer.OrdinalIgnoreCase))
                     {
                         Logger.Log($"Skipping {song} as it is already cached", LogLevel.Important);
                         continue;