diff --git a/src/GameplayAssist.cpp b/src/GameplayAssist.cpp
index af05a52ed4..4ecd6be014 100644
--- a/src/GameplayAssist.cpp
+++ b/src/GameplayAssist.cpp
@@ -47,7 +47,7 @@ void GameplayAssist::PlayTicks( const NoteData &nd, const PlayerState *ps )
 			if( nd.IsThereATapOrHoldHeadAtRow( r ) )
 				iClapRow = r;
 
-		if( iClapRow != -1 )
+		if( iClapRow != -1 && !timing.IsWarpAtRow( iClapRow ) && !timing.IsFakeAtRow( iClapRow ) )
 		{
 			const float fTickBeat = NoteRowToBeat( iClapRow );
 			const float fTickSecond = timing.GetElapsedTimeFromBeatNoOffset( fTickBeat );