diff --git a/stepmania/src/arch/InputHandler/InputHandler.cpp b/stepmania/src/arch/InputHandler/InputHandler.cpp
index 777980d4a3..23773d1a3a 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler.cpp
@@ -20,7 +20,7 @@ void InputHandler::ButtonPressed( DeviceInput di, bool Down )
 
 	INPUTFILTER->ButtonPressed( di, Down );
 
-	if( m_iInputsSinceUpdate >= 50 )
+	if( m_iInputsSinceUpdate >= 1000 )
 	{
 		/*
 		 * We havn't received an update in a long time, so warn about it.  We expect to receive
@@ -28,12 +28,8 @@ void InputHandler::ButtonPressed( DeviceInput di, bool Down )
 		 * m_iInputsSinceUpdate where it is, so we only warn once.  Only updates that didn't provide
 		 * a timestamp are counted; if the driver provides its own timestamps, UpdateTimer is
 		 * optional.
-		 *
-		 * This can also happen if a device sends a lot of inputs at once; for example, a keyboard
-		 * driver that sends every key in one frame.  If that's really needed (wasteful), increase
-		 * the threshold.
 		 */
-		LOG->Warn( "InputHandler::ButtonPressed: Driver sent 50 updates without calling UpdateTimer" );
+		LOG->Warn( "InputHandler::ButtonPressed: Driver sent many updates without calling UpdateTimer" );
 		FAIL_M("x");
 	}
 }