diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index a76f70514..3ef728199 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -234,6 +234,20 @@ 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}"