diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml
index 791822c3df..888714f93b 100644
--- a/mods/d2k/maps/shellmap/map.yaml
+++ b/mods/d2k/maps/shellmap/map.yaml
@@ -126,7 +126,8 @@ Rules:
 		LuaScript:
 			Scripts: shellmap.lua
 		MusicPlaylist:
-			StartingMusic: waitgame
+			StartingMusic: options
+			LoopStartingMusic: True
 		GlobalLightingPaletteEffect:
 	rockettower:
 		Power:
diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml
index e1c7c8bc61..8f6988cf1d 100644
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -5,7 +5,7 @@
 	ActorMap:
 	MusicPlaylist:
 		VictoryMusic: score
-		DefeatMusic: options
+		DefeatMusic: score
 	TerrainGeometryOverlay:
 	ShroudRenderer:
 		ShroudVariants: typea, typeb, typec, typed