diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 3388fc411b..64559e390a 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -961,7 +961,9 @@ void ScreenGameplay::SetupSong( int iSongIndex )
 			/* Update attack bOn flags. */
 			pi->GetPlayerState()->Update(0);
 		}
-
+		
+		if( pi->m_pn != PLAYER_INVALID )
+			NoteDataUtil::RemoveAllButPlayer( ndTransformed, pi->m_pn );
 
 		// load player
 		{