diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index f5f47ea96..a027e7ee8 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -652,16 +652,12 @@ if [ ${isMounted} -eq 0 ]; then
   # delete setup data from RAM
   sudo rm ${setupFile}
 
-  # signal that setup phas is over
+  # signal that setup phase is over
   sed -i "s/^setupPhase=.*/setupPhase='done'/g" ${infoFile}
 
-
   ########################################
   # AFTER SETUP REBOOT
   # touchscreen activation, start with configured SWAP, fix LCD text bug
-
-  # if touchscreen is on (on recover/update) --> reboot now to activate touchscreen 
-  source ${configFile}
   sudo cp /home/admin/raspiblitz.log /home/admin/raspiblitz.log.setup
   /home/admin/config.scripts/blitz.shutdown.sh reboot finalsetup
   sleep 100
diff --git a/home.admin/config.scripts/lnd.unlock.sh b/home.admin/config.scripts/lnd.unlock.sh
index 1943500d9..c12f7f9cd 100755
--- a/home.admin/config.scripts/lnd.unlock.sh
+++ b/home.admin/config.scripts/lnd.unlock.sh
@@ -26,6 +26,13 @@ if [ "${action}" == "chain-unlock" ]; then
     CHAIN=$2
 fi
 
+# dont if state is on reboot or shutdown
+if [ "${state}" == "reboot" ] || [ "${state}" == "shutdown" ]; then
+  echo "# ignore unlock - because system is in shutdown/reboot state"
+  sleep 1
+  exit 0
+fi
+
 source <(/home/admin/config.scripts/network.aliases.sh getvars lnd ${chain}net)
 
 # check if wallet is already unlocked