diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp
index fa2e9e00..31eb66b9 100644
--- a/source/src/serverms.cpp
+++ b/source/src/serverms.cpp
@@ -37,7 +37,7 @@ void disconnectmaster()
     masteraddress.host = ENET_HOST_ANY;
     masteraddress.port = ENET_PORT_ANY;
 
-    lastupdatemaster = 0;
+    //lastupdatemaster = 0;
 }
 
 ENetSocket connectmaster()
@@ -165,7 +165,7 @@ extern int interm;
 // send alive signal to masterserver after 40 minutes of uptime and during an intermission (so theoretically <= 1 hour) - after 1 hour at the latest.
 static inline void updatemasterserver(int millis, int port)
 {
-    if(!lastupdatemaster || (millis-lastupdatemaster>40*60*1000 && interm) || millis-lastupdatemaster>60*60*1000)
+    if(!lastupdatemaster || ((millis-lastupdatemaster)>40*60*1000 && interm) || (millis-lastupdatemaster)>60*60*1000)
     {
         char servername[30]; memset(servername,'\0',30); filtertext(servername,global_name,-1,20);
         if(mastername[0]) requestmasterf("regserv %d %s %d\n", port, servername[0] ? servername : "noname", AC_VERSION);