diff --git a/arangod/Cluster/HeartbeatThread.cpp b/arangod/Cluster/HeartbeatThread.cpp
index e042b8fe2f..6ccfd39ee0 100644
--- a/arangod/Cluster/HeartbeatThread.cpp
+++ b/arangod/Cluster/HeartbeatThread.cpp
@@ -178,13 +178,13 @@ void HeartbeatThread::runDBServer() {
   auto currentAgencyCallback = std::make_shared<AgencyCallback>(
       _agency, "Current/Version", updateCurrent, true);
   
-  registered = false;
+  registered = true;
   while (!registered) {
-    registered = _agencyCallbackRegistry->registerCallback(currentAgencyCallback);
-    if (!registered) {
-      LOG(ERR) << "Couldn't register current change in agency!";
-      sleep(1);
-    }
+    //registered = _agencyCallbackRegistry->registerCallback(currentAgencyCallback);
+    //if (!registered) {
+    //  LOG(ERR) << "Couldn't register current change in agency!";
+    //  sleep(1);
+   // }
   }
   
   while (!isStopping()) {
@@ -232,7 +232,7 @@ void HeartbeatThread::runDBServer() {
       if (!wasNotified) {
         LOG(TRACE) << "Lock reached timeout";
         planAgencyCallback->refetchAndUpdate();
-        currentAgencyCallback->refetchAndUpdate();
+        //currentAgencyCallback->refetchAndUpdate();
       } else {
         // mop: a plan change returned successfully...
         // recheck and redispatch in case our desired versions increased
@@ -244,7 +244,7 @@ void HeartbeatThread::runDBServer() {
   }
 
   _agencyCallbackRegistry->unregisterCallback(planAgencyCallback);
-  _agencyCallbackRegistry->unregisterCallback(currentAgencyCallback);
+  //_agencyCallbackRegistry->unregisterCallback(currentAgencyCallback);
   int count = 0;
   while (++count < 3000) {
     bool isInPlanChange;
diff --git a/js/server/modules/@arangodb/cluster.js b/js/server/modules/@arangodb/cluster.js
index f1816de10b..7918893809 100644
--- a/js/server/modules/@arangodb/cluster.js
+++ b/js/server/modules/@arangodb/cluster.js
@@ -393,10 +393,10 @@ function createLocalDatabases (plannedDatabases, writeLocked) {
           payload.errorNum = err.errorNum;
           payload.errorMessage = err.errorMessage;
         }
-        writeLocked({ part: "Current" },
-                    createDatabaseAgency,
-                    [ payload ]);
       }
+      writeLocked({ part: "Current" },
+                  createDatabaseAgency,
+                  [ payload ]);
     }
   }
 }