diff --git a/scripts/bin/container-init b/scripts/bin/container-init
index c082d45..4332087 100755
--- a/scripts/bin/container-init
+++ b/scripts/bin/container-init
@@ -80,10 +80,5 @@ if [ ! -f "${RDP_TLS_KEY_PATH:?}" ] || [ ! -f "${RDP_TLS_CERT_PATH:?}" ]; then
 	) >/dev/null
 fi
 
-# Remove dbus pidfile
-if [ -e /run/dbus/pid ]; then
-	rm -f /run/dbus/pid
-fi
-
-# Start all services
+# Start runit
 exec tini -- runsvdir -P /etc/service/
diff --git a/scripts/service/dbus-daemon/run b/scripts/service/dbus-daemon/run
index b0bad27..7b9388a 100755
--- a/scripts/service/dbus-daemon/run
+++ b/scripts/service/dbus-daemon/run
@@ -1,4 +1,8 @@
 #!/bin/sh
 
+if [ -e /run/dbus/pid ]; then
+	rm -f /run/dbus/pid
+fi
+
 exec 2>&1
 exec /usr/bin/chpst -u messagebus /usr/bin/dbus-daemon --system --nofork