diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java
index 64072a933..a9a87020f 100644
--- a/src/services/galaxy/ConnectionService.java
+++ b/src/services/galaxy/ConnectionService.java
@@ -70,10 +70,13 @@ public class ConnectionService extends Service {
 		updateRunnable = new Runnable() {
 			public void run() {
 				synchronized (zonedInPlayers) {
-					for (Player p : zonedInPlayers) {
+					Iterator<Player> i = zonedInPlayers.iterator();
+					while (i.hasNext()) {
+						Player p = i.next();
 						if (p.getTimeSinceLastPacket() > LD_THRESHOLD) {
 							logOut(p);
 							disconnect(p, DisconnectReason.TIMEOUT);
+							i.remove();
 						}
 					}
 				}