diff --git a/src/m_cond.c b/src/m_cond.c
index c0dd67e60..d1fd454d7 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -1711,13 +1711,7 @@ boolean M_UpdateUnlockablesAndExtraEmblems(boolean loud, boolean doall)
 		{
 			gamedata->keyspending++;
 			newkeys++;
-		}
-
-		if (newkeys != 0)
-		{
 			response |= true;
-			if (gamedata->musicstate < GDMUSIC_KEYG)
-				gamedata->musicstate = GDMUSIC_KEYG;
 		}
 	}
 
diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c
index 8b8409141..1fa4a3f86 100644
--- a/src/menus/extras-challenges.c
+++ b/src/menus/extras-challenges.c
@@ -449,6 +449,9 @@ void M_ChallengesTick(void)
 					gamedata->keyspending--;
 					gamedata->chaokeys++;
 					challengesmenu.unlockcount[CC_CHAOANIM]++;
+
+					if (gamedata->musicstate < GDMUSIC_KEYG)
+						gamedata->musicstate = GDMUSIC_KEYG;
 				}
 			}
 		}