diff --git a/arangod/Cluster/ClusterInfo.cpp b/arangod/Cluster/ClusterInfo.cpp
index 0873132db4..d0d84243c4 100644
--- a/arangod/Cluster/ClusterInfo.cpp
+++ b/arangod/Cluster/ClusterInfo.cpp
@@ -1130,6 +1130,11 @@ int ClusterInfo::createCollectionCoordinator(std::string const& databaseName,
   // Update our cache:
   loadPlan();
 
+  if (numberOfShards == 0) {
+    loadCurrent();
+    return TRI_ERROR_NO_ERROR;
+  }
+
   {
     CONDITION_LOCKER(locker, agencyCallback->_cv);