diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index 1abc37689..139d2249f 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -198,4 +198,7 @@ echo ""
 echo "Visit https://my.${domain} to finish setup"
 echo ""
 
-systemctl reboot
+if [[ "${initBaseImage}" == "true" ]]; then
+    systemctl reboot
+fi
+