diff --git a/arangod/RestServer/BootstrapFeature.cpp b/arangod/RestServer/BootstrapFeature.cpp
index 78dcf85f5c..0052af15b3 100644
--- a/arangod/RestServer/BootstrapFeature.cpp
+++ b/arangod/RestServer/BootstrapFeature.cpp
@@ -40,7 +40,7 @@ using namespace arangodb::application_features;
 using namespace arangodb::options;
 
 BootstrapFeature::BootstrapFeature(application_features::ApplicationServer* server)
-    : ApplicationFeature(server, "Bootstrap") {
+    : ApplicationFeature(server, "Bootstrap"), _isReady(false) {
   startsAfter("Dispatcher");
   startsAfter("Endpoint");
   startsAfter("Scheduler");
@@ -148,6 +148,8 @@ void BootstrapFeature::start() {
   arangodb::rest::HttpHandlerFactory::setMaintenance(false);
   LOG(INFO) << "ArangoDB (version " << ARANGODB_VERSION_FULL
             << ") is ready for business. Have fun!";
+
+  _isReady = true;
 }
 
 void BootstrapFeature::stop() {
diff --git a/arangod/RestServer/BootstrapFeature.h b/arangod/RestServer/BootstrapFeature.h
index 73a4132f55..1a443284d2 100644
--- a/arangod/RestServer/BootstrapFeature.h
+++ b/arangod/RestServer/BootstrapFeature.h
@@ -33,6 +33,12 @@ class BootstrapFeature final : public application_features::ApplicationFeature {
  public:
   void start() override final;
   void stop() override final;
+  bool isReady() const {
+    return _isReady;
+  }
+
+ private:
+  bool _isReady;
 };
 }