diff --git a/cyphernodeconf_docker/templates/bitcoin/entrypoint.sh b/cyphernodeconf_docker/templates/bitcoin/entrypoint.sh
index 7d547fc..f961a7e 100755
--- a/cyphernodeconf_docker/templates/bitcoin/entrypoint.sh
+++ b/cyphernodeconf_docker/templates/bitcoin/entrypoint.sh
@@ -2,6 +2,16 @@
 
 rm -f /container_monitor/bitcoin_ready
 
+<% if ( features.indexOf('tor') !== -1 && torifyables && torifyables.indexOf('tor_bitcoin') !== -1 ) { %>
+while [  ! -f "/container_monitor/tor_ready" ];
+do
+    echo "CYPHERNODE: Waiting for Tor to be ready before starting bitcoind"
+    sleep 10
+done
+echo "CYPHERNODE: Tor is ready - Starting bitcoind"
+<% } %>
+
+# Create default wallets if they are not loaded
 /.bitcoin/createWallets.sh &
 
 exec bitcoind