diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 57bdd963f..f26cdffdb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20110421
+--------
+main/net_udp.c: When leaving game and still sending extras, don't forget to update the timer so we won't get stuck in an infinite loop
+
 20110420
 --------
 main/multi.c, main/state.c: Resolved termination issue when reading and comparing callsigns fro Coop savestates; Added scores sending after Coop savestate loading as unrestored players will send them when loading new level
diff --git a/main/net_udp.c b/main/net_udp.c
index e2c1cb3f0..600f57266 100644
--- a/main/net_udp.c
+++ b/main/net_udp.c
@@ -3838,7 +3838,10 @@ void net_udp_leave_game()
 	if ((multi_i_am_master()))
 	{
 		while (Network_sending_extras>1 && Player_joining_extras!=-1)
+		{
+			timer_update();
 			net_udp_send_extras();
+		}
 
 		Netgame.numplayers = 0;
 		nsave=N_players;