diff --git a/register_rln.sh b/register_rln.sh
index 1be9dbb..2d7c9d4 100755
--- a/register_rln.sh
+++ b/register_rln.sh
@@ -15,7 +15,11 @@ fi
 
 # TODO: Set nwaku release when ready instead of quay
 
-
+if test -n "${ETH_CLIENT_ADDRESS}"; then
+  echo "ETH_CLIENT_ADDRESS variable was renamed to RLN_RELAY_ETH_CLIENT_ADDRESS"
+  echo "Please update your .env file"
+  exit 1
+fi
 
 docker run -v $(pwd)/keystore:/keystore/:Z harbor.status.im/wakuorg/nwaku:v0.25.0 generateRlnKeystore \
 --rln-relay-eth-client-address=${RLN_RELAY_ETH_CLIENT_ADDRESS} \
diff --git a/run_node.sh b/run_node.sh
index a337225..90333a9 100644
--- a/run_node.sh
+++ b/run_node.sh
@@ -2,6 +2,12 @@
 
 echo "I am a nwaku node"
 
+if test -n "${ETH_CLIENT_ADDRESS}" -o ; then
+  echo "ETH_CLIENT_ADDRESS variable was renamed to RLN_RELAY_ETH_CLIENT_ADDRESS"
+  echo "Please update your .env file"
+  exit 1
+fi
+
 if [ -z "${RLN_RELAY_ETH_CLIENT_ADDRESS}" ]; then
     echo "Missing Eth client address, please refer to README.md for detailed instructions"
     exit 1