diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 2268ce3e4c..37095edad6 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -585,6 +585,9 @@ static int GetNumStagesForCurrentSong()
 /* Called by ScreenGameplay.  Set the length of the current song. */
 void GameState::BeginStage()
 {
+	if( m_bDemonstrationOrJukebox )
+		return;
+
 	/* This should only be called once per stage. */
 	if( m_iNumStagesOfThisSong != 0 )
 		LOG->Warn( "XXX: m_iNumStagesOfThisSong == %i?", m_iNumStagesOfThisSong );