diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh
index 38e9c1837..f1370c766 100755
--- a/home.admin/config.scripts/blitz.statusscan.sh
+++ b/home.admin/config.scripts/blitz.statusscan.sh
@@ -280,22 +280,17 @@ fi
 clnRunning=$(systemctl status ${netprefix}lightningd.service 2>/dev/null | grep -c running)
 echo "clnActive=${clnRunning}"
 echo "CLNwalletLocked=0"
+
 if [ "${clnRunning}" != "1" ] && [ "${LNTYPE}" == "cln" ]; then
-  clnInfo=$($lightningcli_alias getinfo 2>&1)
   # check if locked
-  if [ $(echo "${clnInfo}" | grep -c "Connecting to 'lightning-rpc': Connection refused") -gt 0 ];then
-    echo "# CLN wallet not running yet"
-    clnError=$(sudo journalctl -n5 -u lightningd)
-    if [ $(echo "${clnError}" | grep -c 'encrypted-hsm: Could not read pass from stdin.') -gt 0 ]\
-    || [ $(echo "${clnError}" | grep -c 'hsm_secret is encrypted, you need to pass the --encrypted-hsm startup option.') -gt 0 ]\
-    || [ $(echo "${clnError}" | grep -c 'Wrong password for encrypted hsm_secret.') -gt 0 ]; then
+  if [ "$(sudo journalctl -n5 -u ${netprefix}lightningd | \
+     grep -cE 'Could not read pass from stdin|pass the --encrypted-hsm|Wrong password')" -gt 0 ];then
       echo "CLNwalletLocked=1"
-    fi
   fi
 fi
 
 if [ "${clnRunning}" == "1" ] && [ "${LNTYPE}" == "cln" ]; then
-  clnInfo=$($lightningcli_alias getinfo)
+  clnInfo=$($lightningcli_alias getinfo 2>&1)
   clnBlockHeight=$(echo "${clnInfo}" | jq -r '.blockheight' | tr -cd '[[:digit:]]')
   scanProgress=$(echo "scale=2; $clnBlockHeight*100/$total" | bc)
   echo "scanProgress=${scanProgress}"
diff --git a/home.admin/config.scripts/cln.hsmtool.sh b/home.admin/config.scripts/cln.hsmtool.sh
index eedb509e9..bad138490 100644
--- a/home.admin/config.scripts/cln.hsmtool.sh
+++ b/home.admin/config.scripts/cln.hsmtool.sh
@@ -241,32 +241,41 @@ seedwords6x4='${seedwords6x4}'
 elif [ "$1" = "unlock" ]; then
   # check if unlocked
   attempt=0
-  while [ $($lightningcli_alias getinfo | grep -c '"id":') -eq 0 ];do
+  justUnlocked=0
+  while [ $($lightningcli_alias getinfo 2>&1 | grep -c '"id":') -eq 0 ];do
+    clnError=$(sudo journalctl -n5 -u ${netprefix}lightningd)
     
     # getpassword
-    if [ $(sudo journalctl -n5 -u ${netprefix}lightningd | \
+    if [ $(echo "${clnError}" | \
       grep -c 'encrypted-hsm: Could not read pass from stdin.') -gt 0 ];then
-      if [ -f $passwordFile ];then
-        echo "# Wrong passwordFile is present"
+      if [ ${justUnlocked} -eq 0 ];then 
+        if [ -f $passwordFile ];then
+          echo "# Wrong passwordFile is present"
+        else
+          echo "# No passwordFile is present"
+        fi
+        passwordToFile
+        sudo systemctl restart ${netprefix}lightningd
+        justUnlocked=1
       else
-        echo "# No passwordFile is present"
+        echo "# Waiting to unlock wallet (2) ... "
+        sleep 5
       fi
-      passwordToFile
-      sudo systemctl restart ${netprefix}lightningd
-    
+
     # configure --encrypted-hsm 
-    elif [ $(sudo journalctl -n5 -u ${netprefix}lightningd | \
+    elif [ $(echo "${clnError}" | \
       grep -c 'hsm_secret is encrypted, you need to pass the --encrypted-hsm startup option.') -gt 0 ];then
-      echo "# The hsm_secret is encrypted, but unlock is not configured"
-      passwordToFile
-      # setting value in raspiblitz config
-      sudo sed -i \
-        "s/^${netprefix}clnEncryptedHSM=.*/${netprefix}clnEncryptedHSM=on/g" \
-        /mnt/hdd/raspiblitz.conf
-      /home/admin/config.scripts/cln.install-service.sh $CHAIN
+
+        echo "# The hsm_secret is encrypted, but unlock is not configured"
+        passwordToFile
+        # setting value in raspiblitz config
+        sudo sed -i \
+          "s/^${netprefix}clnEncryptedHSM=.*/${netprefix}clnEncryptedHSM=on/g" \
+          /mnt/hdd/raspiblitz.conf
+        /home/admin/config.scripts/cln.install-service.sh $CHAIN
     
     # get new password 
-    elif [ $(sudo journalctl -n5 -u ${netprefix}lightningd | \
+    elif [ $(echo "${clnError}" | \
       grep -c 'Wrong password for encrypted hsm_secret.') -gt 0 ];then
       echo "# Wrong password"
       sudo rm -f $passwordFile
@@ -280,7 +289,7 @@ elif [ "$1" = "unlock" ]; then
       exit 1
     fi
     echo "# Waiting to unlock wallet ... "
-    sleep 15
+    sleep 5
     attempt=$((attempt+1))
   done
   echo "# Ok the ${netprefix}lightningd wallet is unlocked"