diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 5ac5db1e..235f8ae6 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -235,7 +235,7 @@ void otherplayers()
 {
     loopv(players) if(players[i] && players[i]->type==ENT_PLAYER && players[i]->state==CS_ALIVE)
     {
-        const int lagtime = lastmillis-players[i]->lastupdate;
+        const int lagtime = players[i]->lastupdate ? lastmillis-players[i]->lastupdate : 0;
         if(lagtime>1000)
         {
             players[i]->state = CS_LAGGED;
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 31b2b84f..75b40c6f 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -53,7 +53,7 @@ void updatelagtime(playerent *d)
     int lagtime = lastmillis-d->lastupdate;
     if(lagtime)
     {
-        d->plag = (d->plag*5+lagtime)/6;
+        if(d->lastupdate) d->plag = (d->plag*5+lagtime)/6;
         d->lastupdate = lastmillis;
     }
 }