diff --git a/stepmania/src/AutoKeysounds.cpp b/stepmania/src/AutoKeysounds.cpp
index 80a0ff6808..9ed07929d0 100644
--- a/stepmania/src/AutoKeysounds.cpp
+++ b/stepmania/src/AutoKeysounds.cpp
@@ -70,6 +70,9 @@ void AutoKeysounds::FinishLoading()
 			int iNextRow = INT_MAX;
 			FOREACH_EnabledPlayer(pn)
 			{
+				// XXX Hack. Enabled players need not have their own note data.
+				if( t >= m_ndAutoKeysoundsOnly[pn].GetNumTracks() )
+					continue;
 				int iNextRowForPlayer = iRow;
 				if( m_ndAutoKeysoundsOnly[pn].GetNextTapNoteRowForTrack( t, iNextRowForPlayer ) )
 					iNextRow = min( iNextRow, iNextRowForPlayer );