diff --git a/source/WorldStorage.cpp b/source/WorldStorage.cpp
index 979283895..bdc0e84a9 100644
--- a/source/WorldStorage.cpp
+++ b/source/WorldStorage.cpp
@@ -78,9 +78,11 @@ void cWorldStorage::WaitForFinish(void)
 {
 	LOG("Waiting for the world storage to finish saving");
 	
-	// Cancel all loading requests:
-	cCSLock Lock(m_CSLoadQueue);
-	m_LoadQueue.clear();
+	{
+		// Cancel all loading requests:
+		cCSLock Lock(m_CSLoadQueue);
+		m_LoadQueue.clear();
+	}
 	
 	// Wait for the thread to finish:
 	mShouldTerminate = true;