diff --git a/setup/start.sh b/setup/start.sh
index 9975585a1..ce94b0367 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -148,7 +148,6 @@ cp -r "${script_dir}/start/systemd/." /etc/systemd/system/
 systemctl daemon-reload
 systemctl enable cloudron.target
 systemctl enable iptables-restore
-systemctl enable cloudron-system-setup
 
 # For logrotate
 systemctl enable --now cron
diff --git a/setup/start/systemd/box.service b/setup/start/systemd/box.service
index 965310733..61b3c3d5f 100644
--- a/setup/start/systemd/box.service
+++ b/setup/start/systemd/box.service
@@ -5,6 +5,8 @@ StopWhenUnneeded=true
 ; journald crashes result in a EPIPE in node. Cannot ignore it as it results in loss of logs.
 BindsTo=systemd-journald.service
 After=mysql.service
+; As cloudron-system-setup is a one-shot, the Wants= automatically ensures that the service *finishes*
+Wants=cloudron-system-setup.service
 
 [Service]
 Type=idle