diff --git a/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs b/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs
index d6115e574f..4f6fb8461e 100644
--- a/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs
+++ b/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs
@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Server
 
 		public void Tick(S server)
 		{
-			if (Environment.TickCount - lastPing > MasterPingInterval * 1000)
+			if ((Environment.TickCount - lastPing > MasterPingInterval * 1000) || isInitialPing)
 				PingMasterServer(server);
 			else
 				lock (masterServerMessages)