diff --git a/components/cluster/clustercomponent.cpp b/components/cluster/clustercomponent.cpp
index 613d467bf..4fc1fbfe1 100644
--- a/components/cluster/clustercomponent.cpp
+++ b/components/cluster/clustercomponent.cpp
@@ -1354,6 +1354,7 @@ void ClusterComponent::MessageHandler(const Endpoint::Ptr& sender, const Diction
 
 			localConfig->Remove(hash);
 		}
+		olock.Unlock();
 
 		ObjectLock olock2(localConfig);
 		BOOST_FOREACH(boost::tie(key, boost::tuples::ignore), localConfig) {
@@ -1362,6 +1363,7 @@ void ClusterComponent::MessageHandler(const Endpoint::Ptr& sender, const Diction
 			(void) unlink(path.CStr());
 			configChange = true;
 		}
+		olock2.Unlock();
 
 		if (configChange) {
 			Log(LogInformation, "cluster", "Restarting after configuration change.");