diff --git a/main_menu.gd b/main_menu.gd
index 7961521..ad5c9a8 100644
--- a/main_menu.gd
+++ b/main_menu.gd
@@ -169,8 +169,10 @@ func _on_music_finished():
 		_music_player.play()
 
 func _on_play():
+	# Musik-Player an Parent übergeben damit er weiterspielt
 	if _music_player:
-		_music_player.stop()
+		remove_child(_music_player)
+		get_parent().add_child(_music_player)
 	start_game.emit()
 	get_tree().paused = false
 	queue_free()
diff --git a/world.gd b/world.gd
index 0d3d526..22ddee6 100644
--- a/world.gd
+++ b/world.gd
@@ -754,6 +754,12 @@ func _on_start_game():
 
 # Klasse ausgewählt: Spieler initialisieren
 func _on_class_selected(character_class: CharacterClass):
+	# Menü-Musik stoppen und entfernen
+	for child in get_children():
+		if child is AudioStreamPlayer:
+			child.stop()
+			child.queue_free()
+
 	player.character_class = character_class
 
 	# Skills klassenabhängig aufbauen