diff --git a/src/server.cpp b/src/server.cpp
index 8c03ec880..6756e4a08 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1689,6 +1689,10 @@ void Server::AsyncRunStep()
 		Send queued-for-sending map edit events.
 	*/
 	{
+		// We will be accessing the environment and the connection
+		JMutexAutoLock lock(m_env_mutex);
+		JMutexAutoLock conlock(m_con_mutex);
+
 		// Don't send too many at a time
 		//u32 count = 0;