diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index f3152d0d..f6b2fd01 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -726,6 +726,12 @@ void CL_CreateNewCommands( void ) {
 
 	frame_msec = com_frameTime - old_com_frameTime;
 
+	// if running over 1000fps, act as if each frame is 1ms
+	// prevents divisions by zero
+	if ( frame_msec < 1 ) {
+		frame_msec = 1;
+	}
+
 	// if running less than 5fps, truncate the extra time to prevent
 	// unexpected moves after a hitch
 	if ( frame_msec > 200 ) {