diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index 4145664e10..5bb7cc56af 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -16,6 +16,8 @@
 #include "ThemeManager.h"
 #include "Style.h"
 #include "PlayerState.h"
+#include "ProfileManager.h"
+#include "StatsManager.h"
 
 // HACK: This belongs in ScreenDemonstration
 #define DIFFICULTIES_TO_SHOW		THEME->GetMetric ("ScreenDemonstration","DifficultiesToShow")
@@ -152,6 +154,11 @@ void ScreenJukebox::Init()
 		if( !GAMESTATE->IsPlayerEnabled(p) )
 			continue;
 
+		/* Reset the combo, in case ComboContinuesBetweenSongs is enabled. */
+		Profile* pProfile = PROFILEMAN->GetProfile(p);
+		if( pProfile )
+			STATSMAN->m_CurStageStats.m_player[p].iCurCombo = 0;
+
 		if( GAMESTATE->m_bJukeboxUsesModifiers )
 		{
 			GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.Init();