diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index 57830f63c..319640eea 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -1522,6 +1522,16 @@ void cClientHandle::SendChat(const AString & a_Message)
 
 void cClientHandle::SendChunkData(int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer)
 {
+	ASSERT(m_Player != NULL);
+	
+	if ((m_State == csAuthenticated) || (m_State == csDownloadingWorld))
+	{
+		if ((a_ChunkX == m_Player->GetChunkX()) && (a_ChunkZ == m_Player->GetChunkZ()))
+		{
+			m_Protocol->SendPlayerMoveLook();
+		}
+	}
+	
 	// Check chunks being sent, erase them from m_ChunksToSend:
 	bool Found = false;
 	{
diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 2e5c305cc..26a1a9fad 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -340,9 +340,6 @@ void cProtocol132::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
 	Flush();
 	
 	SendCompass(a_World);
-	
-	// Send the initial position (so that confirmation works, FS #245):
-	SendPlayerMoveLook();
 }