diff --git a/CHANGELOG b/CHANGELOG
index 1ad13f1fa1..b242da1f6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 v3.3.15 (XXXX-XX-XX)
 --------------------
 
+* cluster nodes should retry registering in agency until successful
+
 * fixed some web ui action events related to Running Queries view and Slow
   Queries History view
 
diff --git a/arangod/Cluster/ClusterFeature.cpp b/arangod/Cluster/ClusterFeature.cpp
index 090b5619f6..a1108087a6 100644
--- a/arangod/Cluster/ClusterFeature.cpp
+++ b/arangod/Cluster/ClusterFeature.cpp
@@ -457,12 +457,12 @@ void ClusterFeature::start() {
     result = comm.setValue("Current/ServersRegistered/" + myId,
                            builder.slice(), 0.0);
 
-    if (!result.successful()) {
-      LOG_TOPIC(FATAL, arangodb::Logger::CLUSTER) << "unable to register server in agency: http code: "
-                 << result.httpCode() << ", body: " << result.body();
-      FATAL_ERROR_EXIT();
-    } else {
+    if (result.successful()) {
       break;
+    } else {
+      LOG_TOPIC(WARN, arangodb::Logger::CLUSTER)
+        << "failed to register server in agency: http code: "	
+        << result.httpCode() << ", body: '" << result.body() << "', retrying ...";
     }
 
     sleep(1);