diff --git a/electrs/docker-compose.yml b/electrs/docker-compose.yml
index 6e669a5..ebe5b49 100644
--- a/electrs/docker-compose.yml
+++ b/electrs/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - electrs
     restart: on-failure
     environment:
-      ELECTRUM_HIDDEN_SERVICE: "${APP_HIDDEN_SERVICE}"
+      ELECTRUM_HIDDEN_SERVICE: "${APP_ELECTRS_RPC_HIDDEN_SERVICE}"
       ELECTRUM_LOCAL_SERVICE: "${DEVICE_DOMAIN_NAME}"
       ELECTRS_HOST: "${APP_ELECTRS_NODE_IP}"
       BITCOIN_HOST: "${APP_BITCOIN_NODE_IP}"
diff --git a/electrs/exports.sh b/electrs/exports.sh
index 17a919f..69b8c1b 100644
--- a/electrs/exports.sh
+++ b/electrs/exports.sh
@@ -1,4 +1,7 @@
 export APP_ELECTRS_IP="10.21.22.4"
 export APP_ELECTRS_NODE_IP="10.21.21.10"
 
-export APP_ELECTRS_NODE_PORT="50001"
\ No newline at end of file
+export APP_ELECTRS_NODE_PORT="50001"
+
+rpc_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-rpc/hostname"
+export APP_ELECTRS_RPC_HIDDEN_SERVICE="$(cat "${rpc_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"
\ No newline at end of file
diff --git a/electrs/umbrel-app.yml b/electrs/umbrel-app.yml
index 7786c07..c47a855 100644
--- a/electrs/umbrel-app.yml
+++ b/electrs/umbrel-app.yml
@@ -2,7 +2,7 @@ manifestVersion: 1
 id: electrs
 category: Finance
 name: Electrs
-version: "0.9.4"
+version: "0.9.4-build-2"
 tagline: A simple and efficient Electrum Server
 description: >
   Run your personal Electrum server and connect your Electrum-compatible wallet,