diff --git a/src/Player.cpp b/src/Player.cpp
index 547a62d3b9..84df4df62e 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -1104,6 +1104,13 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
 		ASSERT( iStartRow == trtn->iRow );
 		TapNote &tn = *trtn->pTN;
 		int iEndRow = iStartRow + tn.iDuration;
+		
+		if( iEndRow < iSongRow && vTN.size() > 1 )
+		{
+				trtn = --vTN.erase(trtn);
+				continue;
+		}
+		
 		if( subType == TapNote::SubType_Invalid )
 			subType = tn.subType;