diff --git a/src/cvars.cpp b/src/cvars.cpp
index fcb0e08cd304450bacaf3daaacdcbedd462b30ed..feeed0c9704af27ae72462daf31793637c09ff82 100644
--- a/src/cvars.cpp
+++ b/src/cvars.cpp
@@ -399,7 +399,7 @@ consvar_t cv_menuframeskip = Player("menuframeskip", "Off").values({
 	{144, "MAX"},
 	{0, "Off"},
 });
-consvar_t cv_mindelay = Player("mindelay", "2").min_max(0, 30);
+consvar_t cv_mindelay = Player("mindelay", "2").min_max(0, 15);
 consvar_t cv_movebob = Player("movebob", "1.0").floating_point().min_max(0, 4*FRACUNIT);
 consvar_t cv_netstat = Player("netstat", "Off").on_off().dont_save(); // show bandwidth statistics
 consvar_t cv_netticbuffer = Player("netticbuffer", "1").min_max(0, 3);
diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h
index 7f083d72be3c12cba9bd7fb52f241a8006d7c21c..046488a9895c9a6ead3e33fc3e328ad761647c9e 100644
--- a/src/d_ticcmd.h
+++ b/src/d_ticcmd.h
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#define MAXPREDICTTICS 12
+#define MAXPREDICTTICS 30
 
 // Button/action code definitions.
 typedef enum