diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index b1bf434606..c093c799be 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -706,13 +706,6 @@ function onTick()
 			handleNetMessage(message);
 		}
 	}
-
-	// If the lobby is running, wake it up every 10 seconds so we stay connected.
-	if (Engine.HasXmppClient() && (Date.now() - lastXmppClientPoll) > 10000)
-	{
-		Engine.RecvXmppClient();
-		lastXmppClientPoll = Date.now();
-	}
 }
 
 // Called when user selects number of players
diff --git a/binaries/data/mods/public/gui/lobby/lobby.js b/binaries/data/mods/public/gui/lobby/lobby.js
index e06b13d87b..eefc9975c1 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.js
+++ b/binaries/data/mods/public/gui/lobby/lobby.js
@@ -446,9 +446,6 @@ function stripColorCodes(input)
 
 function onTick()
 {
-	// Wake up XmppClient
-	Engine.RecvXmppClient();
-
 	updateTimers();
 	checkSpamMonitor();
 
diff --git a/binaries/data/mods/public/gui/lobby/prelobby.js b/binaries/data/mods/public/gui/lobby/prelobby.js
index 34d29bab18..308098a8a1 100644
--- a/binaries/data/mods/public/gui/lobby/prelobby.js
+++ b/binaries/data/mods/public/gui/lobby/prelobby.js
@@ -138,9 +138,6 @@ function onTick()
 	// The XmppClient has been created, we are waiting
 	// to be connected or to receive an error.
 
-	//Wake up XmppClient
-	Engine.RecvXmppClient();
-
 	//Receive messages
 	while (true)
 	{
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 80252e04d6..ed86afed8b 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -435,13 +435,6 @@ function onTick()
 
 	// Clear renamed entities list
 	Engine.GuiInterfaceCall("ClearRenamedEntities");
-
-	// If the lobby is running, wake it up every 10 seconds so we stay connected.
-	if (Engine.HasXmppClient() && (Date.now() - lastXmppClientPoll) > 10000)
-	{
-		Engine.RecvXmppClient();
-		lastXmppClientPoll = Date.now();
-	}
 }
 
 function checkPlayerState()
diff --git a/source/gui/scripting/ScriptFunctions.cpp b/source/gui/scripting/ScriptFunctions.cpp
index d7f7c30fb1..fdfd825578 100644
--- a/source/gui/scripting/ScriptFunctions.cpp
+++ b/source/gui/scripting/ScriptFunctions.cpp
@@ -957,7 +957,6 @@ void GuiScriptingInit(ScriptInterface& scriptInterface)
 	scriptInterface.RegisterFunction<void, &JSI_Lobby::StopXmppClient>("StopXmppClient");
 	scriptInterface.RegisterFunction<void, &JSI_Lobby::ConnectXmppClient>("ConnectXmppClient");
 	scriptInterface.RegisterFunction<void, &JSI_Lobby::DisconnectXmppClient>("DisconnectXmppClient");
-	scriptInterface.RegisterFunction<void, &JSI_Lobby::RecvXmppClient>("RecvXmppClient");
 	scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetGameList>("SendGetGameList");
 	scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetBoardList>("SendGetBoardList");
 	scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetRatingList>("SendGetRatingList");
diff --git a/source/lobby/XmppClient.cpp b/source/lobby/XmppClient.cpp
index eecd1ad54e..c3ab638082 100644
--- a/source/lobby/XmppClient.cpp
+++ b/source/lobby/XmppClient.cpp
@@ -22,8 +22,6 @@
 #include "lib/utf8.h"
 
 // Debug
-// TODO: Use builtin error/warning/logging functions.
-#include <iostream>
 #include "ps/CLogger.h"
 
 // Gloox
diff --git a/source/lobby/scripting/JSInterface_Lobby.cpp b/source/lobby/scripting/JSInterface_Lobby.cpp
index 1c6e257386..502c8292d9 100644
--- a/source/lobby/scripting/JSInterface_Lobby.cpp
+++ b/source/lobby/scripting/JSInterface_Lobby.cpp
@@ -80,13 +80,6 @@ void JSI_Lobby::DisconnectXmppClient(ScriptInterface::CxPrivate* UNUSED(pCxPriva
 	g_XmppClient->disconnect();
 }
 
-void JSI_Lobby::RecvXmppClient(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
-{
-	if (!g_XmppClient)
-		return;
-	g_XmppClient->recv();
-}
-
 void JSI_Lobby::SendGetGameList(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 {
 	if (!g_XmppClient)
diff --git a/source/lobby/scripting/JSInterface_Lobby.h b/source/lobby/scripting/JSInterface_Lobby.h
index 4f8d3ef37e..31c1bc07f8 100644
--- a/source/lobby/scripting/JSInterface_Lobby.h
+++ b/source/lobby/scripting/JSInterface_Lobby.h
@@ -34,7 +34,6 @@ namespace JSI_Lobby
 	void StopXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
 	void ConnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
 	void DisconnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
-	void RecvXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
 	void SendGetGameList(ScriptInterface::CxPrivate* pCxPrivate);
 	void SendGetBoardList(ScriptInterface::CxPrivate* pCxPrivate);
 	void SendGetRatingList(ScriptInterface::CxPrivate* pCxPrivate);
diff --git a/source/main.cpp b/source/main.cpp
index 58f05d1c3c..f8458b3302 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -66,6 +66,7 @@ that of Atlas depending on commandline parameters.
 #include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "network/NetSession.h"
+#include "lobby/IXmppClient.h"
 #include "graphics/Camera.h"
 #include "graphics/GameView.h"
 #include "graphics/TextureManager.h"
@@ -348,6 +349,10 @@ static void Frame()
 	if (g_NetClient)
 		g_NetClient->Flush();
 
+	// Keep us connected to any XMPP servers
+	if (g_XmppClient)
+		g_XmppClient->recv();
+
 	g_UserReporter.Update();
 
 	g_Console->Update(realTimeSinceLastFrame);