1 files changed, 2 insertions, 1 deletions

diff --git a/src/Server.cpp b/src/Server.cpp
index a1dedf333..67629ef2c 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -648,7 +648,8 @@ void cServer::Shutdown(void)
 	// Notify the tick thread and wait for it to terminate:
 	m_TickThread.Stop();
 
-	cRoot::Get()->SaveAllChunks();
+	// Save all chunks in all worlds, wait for chunks to be sent to the ChunkStorage queue for each world:
+	cRoot::Get()->SaveAllChunksNow();
 
 	// Remove all clients:
 	cCSLock Lock(m_CSClients);