diff --git a/arangod/Cluster/ApplicationCluster.cpp b/arangod/Cluster/ApplicationCluster.cpp
index 9d152779b9..fba7c2ae92 100644
--- a/arangod/Cluster/ApplicationCluster.cpp
+++ b/arangod/Cluster/ApplicationCluster.cpp
@@ -449,6 +449,10 @@ void ApplicationCluster::stop() {
     }
   }
 
+  while (_heartbeat->isRunning()) {
+    usleep(50000);
+  }
+
   // ClusterComm::cleanup();
   AgencyComm::cleanup();
 }