diff --git a/backend/app.py b/backend/app.py
index 8b3d2b29..ca204ca6 100755
--- a/backend/app.py
+++ b/backend/app.py
@@ -1,14 +1,5 @@
 # -*- coding: utf-8 -*-
 """Create an application instance."""
 from grant.app import create_app
-from grant.blockchain.bootstrap import send_bootstrap_data
 
 app = create_app()
-
-
-@app.before_first_request
-def bootstrap_watcher():
-    try:
-        send_bootstrap_data()
-    except:
-        print('Failed to send bootstrap data, watcher must be offline')
diff --git a/blockchain/src/index.ts b/blockchain/src/index.ts
index 05b5a827..bc4c9506 100755
--- a/blockchain/src/index.ts
+++ b/blockchain/src/index.ts
@@ -16,7 +16,7 @@ async function start() {
   log.info("============== Starting services ==============");
   await initNode();
   await RestServer.start();
-  await Webhooks.start();
+  Webhooks.start();
   log.info("===============================================");
 }
 
diff --git a/blockchain/src/webhooks/index.ts b/blockchain/src/webhooks/index.ts
index d7e0e6e7..a6e4bb43 100755
--- a/blockchain/src/webhooks/index.ts
+++ b/blockchain/src/webhooks/index.ts
@@ -17,7 +17,13 @@ const MIN_BLOCK_CONF = parseInt(env.MINIMUM_BLOCK_CONFIRMATIONS, 10);
 export async function start() {
   initScan();
   initNotifiers();
-  await requestBootstrap();
+
+  let { startingBlockHeight } = store.getState();
+  while (!startingBlockHeight) {
+    await requestBootstrap();
+    await sleep(10000);
+    startingBlockHeight = store.getState().startingBlockHeight;
+  }
 }
 
 export function exit() {