diff --git a/arangod/Cluster/ApplicationCluster.cpp b/arangod/Cluster/ApplicationCluster.cpp
index 9c23840ae7..0429c4c06a 100644
--- a/arangod/Cluster/ApplicationCluster.cpp
+++ b/arangod/Cluster/ApplicationCluster.cpp
@@ -401,8 +401,18 @@ void ApplicationCluster::stop () {
 
   {
     AgencyCommLocker locker("Current", "WRITE"); 
-
+    
     if (locker.successful()) {
+      // unregister ourselves 
+      ServerState::RoleEnum role = ServerState::instance()->getRole();
+
+      if (role == ServerState::ROLE_PRIMARY) {
+        comm.removeValues("Current/DBServers/" + _myId, false);
+      }
+      else if (role == ServerState::ROLE_COORDINATOR) {
+        comm.removeValues("Current/Coordinators/" + _myId, false);
+      }
+
       // unregister ourselves 
       comm.removeValues("Current/ServersRegistered/" + _myId, false);
     }