diff --git a/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt b/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
index fa36819b93..54192cd7f2 100644
--- a/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
+++ b/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
@@ -167,6 +167,8 @@ class DiplomacyScreen(
 
     private fun updateRightSide(otherCiv: Civilization) {
         rightSideTable.clear()
+        UncivGame.Current.musicController.chooseTrack(otherCiv.civName,
+            MusicMood.peaceOrWar(viewingCiv.isAtWarWith(otherCiv)),MusicTrackChooserFlags.setSelectNation)
         if (otherCiv.isCityState()) rightSideTable.add(
             ScrollPane(getCityStateDiplomacyTable(otherCiv))
         )
@@ -696,9 +698,6 @@ class DiplomacyScreen(
             if (promisesTable != null) diplomacyTable.add(promisesTable).row()
         }
 
-        UncivGame.Current.musicController.chooseTrack(otherCiv.civName,
-            MusicMood.peaceOrWar(viewingCiv.isAtWarWith(otherCiv)), MusicTrackChooserFlags.setSelectNation)
-
         return diplomacyTable
     }