diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index 1ddb2d6ad1..989b780dff 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -354,7 +354,7 @@ bool TimingData::IsWarpAtRow( int iNoteRow ) const
 		{
 			return true;
 		}
-		if( GetStopAtRow(iNoteRow) != 0.0f )
+		if( GetStopAtRow(iNoteRow) != 0.0f || GetDelayAtRow(iNoteRow) != 0.0f )
 		{
 			return false;
 		}