diff --git a/src/Game/Client.java b/src/Game/Client.java
index 926e1299..cfdedcf3 100644
--- a/src/Game/Client.java
+++ b/src/Game/Client.java
@@ -936,18 +936,18 @@ public static void update() {
     float delta_time = (float) (nanoTime - last_time) / 1000000000.0f;
     last_time = nanoTime;
 
+    // Set the mudclient volume
+    if (!customSfxVolumeSet) {
+      SoundEffects.adjustMudClientSfxVolume();
+      customSfxVolumeSet = true;
+    }
+
     // Handle area data
     if (Settings.CUSTOM_MUSIC.get(Settings.currentProfile)) {
       if (state == STATE_GAME) {
         AreaDefinition area = getCurrentAreaDefinition();
         MusicPlayer.playTrack(area.music);
       } else if (state == STATE_LOGIN) {
-        // Set the client volume
-        if (!customSfxVolumeSet) {
-          SoundEffects.adjustMudClientSfxVolume();
-          customSfxVolumeSet = true;
-        }
-
         MusicPlayer.playTrack(loginTrack);
       }
     }