diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index eb67f69119..32cfa7cbcf 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -51,6 +51,11 @@ void NoteData::SetNumTracks( int iNewNumTracks )
 		else
 			m_TapNotes[t].clear();
 	}
+
+	/* Remove all hold notes that are out of bounds. */
+	for( int h = m_HoldNotes.size()-1; h >= 0; --h )
+		if( m_HoldNotes[h].iTrack >= iNewNumTracks )
+			m_HoldNotes.erase( m_HoldNotes.begin()+h );
 }