diff --git a/src/sound/sound_server.cpp b/src/sound/sound_server.cpp
index 9b4663016..d5252261c 100644
--- a/src/sound/sound_server.cpp
+++ b/src/sound/sound_server.cpp
@@ -230,8 +230,8 @@ global void PlayMusic(const char* name)
 	    do {
 		if (CDTrack > NumCDTracks)
 		    CDTrack = 1;
+	    } while (cd_is_audio(++CDTrack) < 1);
 		cd_play(CDTrack);
-	    } while (cd_is_audio(CDTrack++) < 1);
 	    return;
 	}