diff --git a/arangod/Cluster/ClusterInfo.cpp b/arangod/Cluster/ClusterInfo.cpp
index bf4ecb0441..e4a6e5ee8c 100644
--- a/arangod/Cluster/ClusterInfo.cpp
+++ b/arangod/Cluster/ClusterInfo.cpp
@@ -1413,7 +1413,7 @@ int ClusterInfo::dropCollectionCoordinator(
 
       if (TRI_microtime() > endTime) {
         LOG_TOPIC(ERR, Logger::CLUSTER)
-            << "Timeout in _drop collection"
+            << "Timeout in _drop collection (" << realTimeout << ")"
             << ": database: " << databaseName << ", collId:" << collectionID
             << "\ntransaction sent to agency: " << trans.toJson();
         AgencyCommResult ag = ac.getValues("");
@@ -2652,6 +2652,17 @@ void ClusterInfo::invalidatePlan() {
   }
 }
 
+//////////////////////////////////////////////////////////////////////////////
+/// @brief invalidate current coordinators
+//////////////////////////////////////////////////////////////////////////////
+
+void ClusterInfo::invalidateCurrentCoordinators() {
+  {
+    WRITE_LOCKER(writeLocker, _coordinatorsProt.lock);
+    _coordinatorsProt.isValid = false;
+  }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 /// @brief invalidate current
 //////////////////////////////////////////////////////////////////////////////
@@ -2665,14 +2676,11 @@ void ClusterInfo::invalidateCurrent() {
     WRITE_LOCKER(writeLocker, _DBServersProt.lock);
     _DBServersProt.isValid = false;
   }
-  {
-    WRITE_LOCKER(writeLocker, _coordinatorsProt.lock);
-    _coordinatorsProt.isValid = false;
-  }
   {
     WRITE_LOCKER(writeLocker, _currentProt.lock);
     _currentProt.isValid = false;
   }
+  invalidateCurrentCoordinators();
 }
 
 //////////////////////////////////////////////////////////////////////////////