diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java
index 084c267..9ccb7c4 100644
--- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java
+++ b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java
@@ -275,6 +275,12 @@ public static void teleportToLobby(Identifier dimID, Collection<ServerPlayerEnti
     private static void lobbyTP(ServerWorld world, ServerPlayerEntity player, String[] coords, BaseMapAddon addon) {
         loadResourcePacks(addon, player);
 
+        if (SwitchableResourcepacksMod.isSafeMusicEnabled(player) && addon.safe_music_pack != null) {
+            SwitchableResourcepacksMod.setMusicPack(player, addon.safe_music_pack);
+        } else {
+            SwitchableResourcepacksMod.setMusicPack(player, addon.music_pack);
+        }
+
         float yaw = player.getYaw();
         float pitch = player.getPitch();