diff --git a/js/server/modules/org/arangodb/cluster.js b/js/server/modules/org/arangodb/cluster.js
index d12653d093..1f8c22c687 100644
--- a/js/server/modules/org/arangodb/cluster.js
+++ b/js/server/modules/org/arangodb/cluster.js
@@ -271,8 +271,8 @@ function handleDatabaseChanges (plan, current) {
 function createLocalCollections (plannedCollections) {
   var ourselves = ArangoServerState.id();
 
-  var createCollectionAgency = function (database, payload) { 
-    ArangoAgency.set("Current/Collections/" + database + "/" + payload.id + "/" + ourselves, 
+  var createCollectionAgency = function (database, shard, payload) { 
+    ArangoAgency.set("Current/Collections/" + database + "/" + payload.id + "/" + shard, 
                      payload);
   };
   
@@ -336,7 +336,7 @@ function createLocalCollections (plannedCollections) {
 
                       writeLocked({ part: "Current" }, 
                                   createCollectionAgency, 
-                                  [ database, payload ]);
+                                  [ database, shard, payload ]);
                     }
                     else {
                       // collection exists, now compare collection properties
@@ -370,7 +370,7 @@ function createLocalCollections (plannedCollections) {
 
                         writeLocked({ part: "Current" }, 
                                     createCollectionAgency, 
-                                    [ database, payload ]);
+                                    [ database, shard, payload ]);
                       }
                     }
                   }