diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 52f87f6571..9f511f9e5a 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -932,6 +932,9 @@ void BGAnimationLayer::Update( float fDeltaTime )
 		{
 			PlayCommand( "On" );
 			m_fSecondsUntilNextCommand += m_fRepeatCommandEverySeconds;
+
+			/* In case we delayed a long time, don't queue two repeats at once. */
+			wrap( m_fSecondsUntilNextCommand, m_fRepeatCommandEverySeconds );
 		}
 	}
 }