diff --git a/src/project.cpp b/src/project.cpp
index 294b6d45..83de74f1 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -403,20 +403,22 @@ QString Project::readMapLocation(QString map_name) {
 }
 
 void Project::setNewMapHeader(Map* map, int mapIndex) {
-    map->song = "MUS_DAN02";
     map->layoutId = QString("%1").arg(mapIndex);
     map->location = "MAPSEC_LITTLEROOT_TOWN";
     map->requiresFlash = "FALSE";
     map->weather = "WEATHER_SUNNY";
     map->type = "MAP_TYPE_TOWN";
     if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeruby) {
+        map->song = "MUS_DAN02";
         map->show_location = "TRUE";
     } else if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeemerald) {
+        map->song = "MUS_DAN02";
         map->allowBiking = "1";
         map->allowEscapeRope = "0";
         map->allowRunning = "1";
         map->show_location = "1";
     }  else if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) {
+        map->song = "MUS_MASARA";
         map->allowBiking = "1";
         map->allowEscapeRope = "0";
         map->allowRunning = "1";
diff --git a/src/ui/newmappopup.cpp b/src/ui/newmappopup.cpp
index 9ba8936f..9191a73f 100644
--- a/src/ui/newmappopup.cpp
+++ b/src/ui/newmappopup.cpp
@@ -135,7 +135,11 @@ void NewMapPopup::on_pushButton_NewMap_Accept_clicked() {
     newMap->name = newMapName;
     newMap->type = this->ui->comboBox_NewMap_Type->currentText();
     newMap->location = this->ui->comboBox_NewMap_Location->currentText();
-    newMap->song = "MUS_DAN02";
+    if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) {
+        newMap->song = "MUS_MASARA";
+    } else {
+        newMap->song = "MUS_DAN02";
+    }
     newMap->requiresFlash = "0";
     newMap->weather = "WEATHER_SUNNY";
     newMap->show_location = "1";