diff --git a/tools/masterserver/wzmasterserver.py b/tools/masterserver/wzmasterserver.py
index ecac15322..0f1afb093 100644
--- a/tools/masterserver/wzmasterserver.py
+++ b/tools/masterserver/wzmasterserver.py
@@ -189,12 +189,11 @@ class RequestHandler(SocketServer.ThreadingMixIn, SocketServer.StreamRequestHand
 					if not newGameData:
 						logging.debug("End of gameserver")
 						return
-				
-				#set Gamedata
-				g.setData(newGameData)
-				#set gamehost
-				g.host = gameHost
-				gdb.listGames()
+					#set Gamedata
+					g.setData(newGameData)
+					#set gamehost
+					g.host = gameHost
+					gdb.listGames()
 			except KeyError:
 				logging.warning("Communication error with %s" % g )
 			finally: