diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 0dde3561c8..46a73be5da 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -55,6 +55,7 @@ void NoteField::Unload()
 		it != m_NoteDisplays.end(); ++it )
 		delete it->second;
 	m_NoteDisplays.clear();
+	LastDisplay = NULL;
 }
 
 void NoteField::CacheNoteSkin( CString skin )