diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 5ee6f63d02..08f35d9b52 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -320,8 +320,11 @@ float FindLastDisplayedBeat( PlayerNumber pn, int iLastPixelToDraw )
 	//
 	float fSearchDistance = 20;
 	float fLastBeatToDraw = GAMESTATE->m_fSongBeat+fSearchDistance;	
+	/* With a song that starts with little zero padding at the top of the
+	 * note data, the first LastBeat was -28.  Putting the start at 20 means
+	 * -28 is out of range (0, -10, -15, -17). */
 	if( GAMESTATE->m_fSongBeat < 0 )
-		fLastBeatToDraw = fSearchDistance;	
+		fLastBeatToDraw = 0; //fSearchDistance;
 
 	const int NUM_ITERATIONS = 15;