diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index 55c3c514d..a9045c33c 100644
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -40,6 +40,7 @@ void Zone::OnAllConfigLoaded(void)
 	Array::Ptr endpoints = GetEndpointsRaw();
 
 	if (endpoints) {
+		ObjectLock olock(endpoints);
 		BOOST_FOREACH(const String& endpoint, endpoints) {
 			Endpoint::GetByName(endpoint)->SetCachedZone(this);
 		}