diff --git a/csqc/pmove.qc b/csqc/pmove.qc
index 95db379e..e23a9da5 100644
--- a/csqc/pmove.qc
+++ b/csqc/pmove.qc
@@ -871,7 +871,8 @@ DEFCVAR_FLOAT(cl_upspeed, 400);
 void PM_InputFrame() {
     float iz = input_movevalues.z;
     input_movevalues.z = 0;
-    float max_speed = pstate_pred.csqc_maxspeed;
+
+    float max_speed = isdemo() ? SPEC_MAXSPEED : pstate_pred.csqc_maxspeed;
 
 #if 0  // Quick fix
     // cl_smartjump replacement