diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index 5babeed0..2db2e2f1 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -232,20 +232,6 @@ do
       fi
       echo "command to shutdown --> off"
       exit 1
-    elif [ "${state}" == "reboot" ] || [ "${state}" == "shutdown" ]; then
-      clear
-      echo "***********************************************************"
-      echo "RaspiBlitz going to ${state}"
-      echo "***********************************************************"
-      if [ "${state}" == "reboot" ]; then
-        if [ "${message}" == "finalsetup" ]; then
-          echo "This is the final setup reboot - you will get disconnected."
-        fi
-        echo "SSH again into system with:"
-        echo "ssh admin@${localip}"
-        echo "***********************************************************"
-      fi
-      exit 0
     else
         # every other state just push as event to SSH frontend
         /home/admin/setup.scripts/eventInfoWait.sh "${state}" "${message}"
@@ -253,6 +239,23 @@ do
 
   fi
 
+  # exit loop/script in case if system shutting down
+  if [ "${state}" == "reboot" ] || [ "${state}" == "shutdown" ]; then
+    clear
+    echo "***********************************************************"
+    echo "RaspiBlitz going to ${state}"
+    echo "***********************************************************"
+    if [ "${state}" == "reboot" ]; then
+      if [ "${message}" == "finalsetup" ]; then
+        echo "This is the final setup reboot - you will get disconnected."
+      fi
+      echo "SSH again into system with:"
+      echo "ssh admin@${localip}"
+      echo "***********************************************************"
+    fi
+    exit 0
+  fi
+
 done
 
 echo "# menu loop received exit code ${exitMenuLoop} --> exit to terminal"
diff --git a/home.admin/setup.scripts/eventInfoWait.sh b/home.admin/setup.scripts/eventInfoWait.sh
index 66c94883..ebbac910 100644
--- a/home.admin/setup.scripts/eventInfoWait.sh
+++ b/home.admin/setup.scripts/eventInfoWait.sh
@@ -38,13 +38,19 @@ backtitle="RaspiBlitz ${codeVersion} / ${eventID} / ${localip}"
 # 1) WELL DEFINED EVENTS
 ################################################
 
-if [ "${eventID}" == "starting" ] || [ "${eventID}" == "system-init" ] || [ "${eventID}" == "ready" ]; then
+if [ "${eventID}" == "starting" ] || [ "${eventID}" == "system-init" ]; then
 
     dialog --backtitle "${backtitle}" --cr-wrap --infobox "
 Starting RaspiBlitz
 Please wait ...
 " 6 24
 
+elif [ "${eventID}" == "ready" ]; then
+
+    dialog --backtitle "${backtitle}" --cr-wrap --infobox "
+Please wait ...
+" 5 20
+
 elif [ "${eventID}" == "waitsync" ]; then
 
     dialog --backtitle "${backtitle}" --cr-wrap --infobox "