diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 1f92f911f..5cb6486bb 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4961,8 +4961,8 @@ static void HandlePacketFromPlayer(SINT8 node)
 				txtpak = (UINT8 *)&netbuffer->u.serverpak.cmds[netbuffer->u.serverpak.numslots
 					* netbuffer->u.serverpak.numtics];
 
-			if (realend > gametic + BACKUPTICS)
-				realend = gametic + BACKUPTICS;
+			if (realend > gametic + CLIENTBACKUPTICS)
+				realend = gametic + CLIENTBACKUPTICS;
 			cl_packetmissed = realstart > neededtic;
 
 			if (realstart <= neededtic && realend > neededtic)
@@ -5407,8 +5407,8 @@ static void SV_SendTics(void)
 			realfirsttic = supposedtics[n];
 			lasttictosend = maketic;
 
-			if (lasttictosend - nettics[n] >= BACKUPTICS)
-				lasttictosend = nettics[n] + BACKUPTICS-1;
+			if (lasttictosend - nettics[n] >= CLIENTBACKUPTICS)
+				lasttictosend = nettics[n] + CLIENTBACKUPTICS-1;
 
 			if (realfirsttic >= lasttictosend)
 			{
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index e08ecf7b4..91af4a466 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -43,6 +43,7 @@ applications may follow different packet versions.
 
 // Networking and tick handling related.
 #define BACKUPTICS 512 // more than enough for most timeouts....
+#define CLIENTBACKUPTICS 32
 #define MAXTEXTCMD 512
 
 // No. of tics your controls can be delayed by.