diff --git a/src/Player.cpp b/src/Player.cpp
index f8582c9a06..ab8ebdb412 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -2852,7 +2852,8 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 			// check to see if there's a note at the crossed row
 			if( m_pPlayerState->m_PlayerController != PC_HUMAN )
 			{
-				if( tn.type != TapNote::empty && tn.type != TapNote::fake && tn.result.tns == TNS_None )
+				if(tn.type != TapNote::empty && tn.type != TapNote::fake && tn.result.tns == TNS_None
+				   && this->m_Timing->IsJudgableAtRow(iRow) )
 				{
 					Step( iTrack, iRow, now, false, false );
 					if( m_pPlayerState->m_PlayerController == PC_AUTOPLAY )