diff --git a/src/s_sound.c b/src/s_sound.c
index 8feb3a3eb..89a04a6f9 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -261,6 +261,7 @@ void S_RegisterSoundStuff(void)
 	CV_RegisterVar(&cv_samplerate);
 	CV_RegisterVar(&cv_playsoundifunfocused);
 	CV_RegisterVar(&cv_playmusicifunfocused);
+	CV_RegisterVar(&cv_streamersafemusic);
 	CV_RegisterVar(&cv_gamesounds);
 	CV_RegisterVar(&cv_gamedigimusic);
 
@@ -1699,6 +1700,11 @@ void S_ShowMusicCredit(void)
 		return;
 	}
 
+	if (def->contentidunsafe && cv_streamersafemusic.value)
+	{
+		return;
+	}
+
 	work = va("\x1F %s", def->title);
 	worklen = strlen(work);
 	if (worklen <= len)