diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 366359d01e..82006249fc 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -851,6 +851,8 @@ void ScreenGameplay::InitSongQueues()
 				Song *pSong = m_apSongsQueue[i];
 				Steps *pOldSteps = pi->m_vpStepsQueue[i];
 				Steps *pSteps = SongUtil::GetOneSteps( pSong, pOldSteps->m_StepsType, pi->m_difficultyForced );
+				if( pSteps == NULL )
+					pSteps = SongUtil::GetClosestNotes( pSong, pOldSteps->m_StepsType, pi->m_difficultyForced );
 				ASSERT( pSteps );
 				pi->m_vpStepsQueue[i] = pSteps;
 			}