diff --git a/src/g_game.c b/src/g_game.c
index c406addd6..efa48408a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4143,6 +4143,9 @@ static void G_DoCompleted(void)
 	if (modeattacking && pausedelay)
 		pausedelay = 0;
 
+	// We do this here so Challenges-related sounds aren't insta-killed
+	S_StopSounds();
+
 	if (legitimateexit && !demo.playback && !mapreset) // (yes you're allowed to unlock stuff this way when the game is modified)
 	{
 		UINT8 roundtype = GDGT_CUSTOM;
@@ -4221,8 +4224,6 @@ static void G_DoCompleted(void)
 	if (automapactive)
 		AM_Stop();
 
-	S_StopSounds();
-
 	prevmap = (INT16)(gamemap-1);
 
 	if (!demo.playback)