diff --git a/source/WorldStorage.cpp b/source/WorldStorage.cpp
index acd681e7f..4a4b68134 100644
--- a/source/WorldStorage.cpp
+++ b/source/WorldStorage.cpp
@@ -152,6 +152,9 @@ void cWorldStorage::WaitForFinish(void)
 		m_LoadQueue.clear();
 	}
 	
+	// Wait for the saving to finish:
+	WaitForQueuesEmpty();
+	
 	// Wait for the thread to finish:
 	m_ShouldTerminate = true;
 	m_Event.Set();