diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 30c73c5a57..90aa8c1fe8 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -688,6 +688,17 @@ void GameState::BeginStage()
 
 void GameState::CancelStage()
 {
+	FOREACH_CpuPlayer( p )
+	{
+		switch( m_PlayMode )
+		{
+			case PLAY_MODE_BATTLE:
+			case PLAY_MODE_RAVE:
+			m_iPlayerStageTokens[p] = PREFSMAN->m_iSongsPerPlay;
+		}
+
+	}
+
 	FOREACH_EnabledPlayer( p )
 		m_iPlayerStageTokens[p] += m_iNumStagesOfThisSong;
 	m_iNumStagesOfThisSong = 0;