diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7851e1b62..1f5e1f1ae 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4966,7 +4966,7 @@ static void CL_SendClientCmd(void)
 
 	fastest = 0;
 
-	if (server)
+	if (server && ! cv_lagless.value)
 	{
 		for (i = 0; i < MAXPLAYERS; ++i)
 		{
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 70dff2fcf..ede7558ad 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -447,6 +447,8 @@ consvar_t cv_jointimeout = {"jointimeout", "105", CV_CALL|CV_SAVE, nettimeout_co
 static CV_PossibleValue_t maxping_cons_t[] = {{0, "MIN"}, {1000, "MAX"}, {0, NULL}};
 consvar_t cv_maxping = {"maxping", "800", CV_SAVE, maxping_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_lagless = {"lagless", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 static CV_PossibleValue_t pingtimeout_cons_t[] = {{8, "MIN"}, {120, "MAX"}, {0, NULL}};
 consvar_t cv_pingtimeout = {"pingtimeout", "10", CV_SAVE, pingtimeout_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -711,6 +713,7 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_skipmapcheck);
 	CV_RegisterVar(&cv_sleep);
 	CV_RegisterVar(&cv_maxping);
+	CV_RegisterVar(&cv_lagless);
 	CV_RegisterVar(&cv_pingtimeout);
 	CV_RegisterVar(&cv_showping);
 
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index d1f28665c..7a11a809d 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -144,6 +144,7 @@ extern consvar_t cv_ringslinger, cv_soundtest;
 extern consvar_t cv_specialrings, cv_powerstones, cv_matchboxes, cv_competitionboxes;
 
 extern consvar_t cv_maxping;
+extern consvar_t cv_lagless;
 extern consvar_t cv_pingtimeout;
 extern consvar_t cv_showping;