diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index 2f0c3e44a..175ea7749 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -446,8 +446,9 @@ void S_Start ()
 	// start new music for the level
 	MusicPaused = false;
 
-	// [RH] This is a lot simpler now.
-	if (!savegamerestore)
+	// Don't start the music if loading a savegame, because the music is stored there.
+	// Don't start the music if revisiting a level in a hub for the same reason.
+	if (!savegamerestore && (level.info->snapshot == NULL || !level.info->isValid()))
 	{
 		if (level.cdtrack == 0 || !S_ChangeCDMusic (level.cdtrack, level.cdid))
 			S_ChangeMusic (level.Music, level.musicorder);