diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 537fa1085f..f3ac52890f 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1559,10 +1559,11 @@ void ScreenGameplay::UpdateLights()
 
 		bCrossedABeat = fBeatLast != fBeatNow;
 
-		for( int r=iRowLastCrossed+1; r<=iRowNow; r++ )  // for each index we crossed since the last update
-		{
-			FOREACH_CabinetLight( cl )
-			{	
+		FOREACH_CabinetLight( cl )
+		{	
+			// for each index we crossed since the last update:
+			FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( m_CabinetLightsNoteData, cl, r, iRowLastCrossed+1, iRowNow )
+			{
 				bool bBlink = (m_CabinetLightsNoteData.GetTapNote( cl, r ).type != TapNote::empty );
 				bBlinkCabinetLight[cl] |= bBlink;
 			}