diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 53a2fb235..5b1131a39 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -5505,7 +5505,7 @@ void NetUpdate(void)
 		// update node latency values so we can take an average later.
 		for (i = 0; i < MAXPLAYERS; i++)
 			if (playeringame[i] && playernode[i] != UINT8_MAX)
-				realpingtable[i] += G_TicsToMilliseconds(GetLag(playernode[i]));
+				realpingtable[i] += GetLag(playernode[i]) * (1000.00f / TICRATE);
 		pingmeasurecount++;
 	}
 
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 6b06764f9..cb23883a8 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -33,7 +33,7 @@ applications may follow different packet versions.
 //  be transmitted.
 
 // Networking and tick handling related.
-#define BACKUPTICS 96
+#define BACKUPTICS 1024
 #define CLIENTBACKUPTICS 32
 #define MAXTEXTCMD 256
 //