diff --git a/source/core/mapinfo.cpp b/source/core/mapinfo.cpp
index 1d7d8b391..9a46b29ec 100644
--- a/source/core/mapinfo.cpp
+++ b/source/core/mapinfo.cpp
@@ -249,6 +249,8 @@ MapRecord* SetupUserMap(const char* boardfilename, const char *defaultmusic)
 	map->name = "";
 	map->SetFileName(boardfilename);
 	map->flags = MI_USERMAP|MI_FORCEEOG;
-	map->music = G_SetupFilenameBasedMusic(boardfilename, defaultmusic);
+	int lookup = LookupMusic(boardfilename, true);
+	if (lookup >= 0) map->music = fileSystem.GetFileFullName(lookup);
+	else map->music = defaultmusic;
 	return map;
 }