diff --git a/src/Player.cpp b/src/Player.cpp
index 8f727a35d7..fdf02b8fc6 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -2639,6 +2639,10 @@ void Player::UpdateJudgedRows()
 			int iRow = iter.Row();
 			TapNote &tn = *iter;
 
+			// if row is within a warp section, ignore it. -aj
+			if( GAMESTATE->m_pCurSong->m_Timing.IsWarpAtRow(iRow) )
+				continue;
+
 			if( iRow != iLastSeenRow )
 			{
 				iLastSeenRow = iRow;