diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/finish b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/finish
new file mode 100755
index 0000000..7cf9745
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/finish
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+if [ -z "${LOGS_TO_STDOUT}" ]; then
+    exit 125
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run
index 96b4ad3..d017df2 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run
@@ -6,5 +6,4 @@ if [ -n "${LOGS_TO_STDOUT}" ]; then
     tail -F $TAIL_LOGS
 else
     echo "**** Env var LOGS_TO_STDOUT is not set, sleeping ****"
-    sleep infinity
 fi