diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 6b061c53f..7a6938b77 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -1885,7 +1885,11 @@ bool cChunk::AddClient(cClientHandle * a_Client)
 
 void cChunk::RemoveClient(cClientHandle * a_Client)
 {
-	m_LoadedByClient.erase(std::remove(m_LoadedByClient.begin(), m_LoadedByClient.end(), a_Client));
+	auto itr = std::remove(m_LoadedByClient.begin(), m_LoadedByClient.end(), a_Client);
+	// We should always remove at most one client.
+	ASSERT(std::distance(itr, m_LoadedByClient.end()) <= 1);
+	// Note: itr can equal m_LoadedByClient.end()
+	m_LoadedByClient.erase(itr, m_LoadedByClient.end());
 
 	if (!a_Client->IsDestroyed())
 	{
diff --git a/src/Chunk.h b/src/Chunk.h
index 683965c62..6316f6910 100644
--- a/src/Chunk.h
+++ b/src/Chunk.h
@@ -441,9 +441,7 @@ public:
 	// Makes a copy of the list
 	cClientHandleList GetAllClients(void) const
 	{
-		cClientHandleList copy;
-		std::copy(m_LoadedByClient.begin(), m_LoadedByClient.end(), std::back_inserter(copy));
-		return copy;
+		return cClientHandleList(m_LoadedByClient.begin(), m_LoadedByClient.end());
 	}
 
 private: