diff --git a/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run b/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run
index e242d7df..e75fa8a4 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run
@@ -35,6 +35,9 @@ if [ ! -d "$HOME/.XDG" ]; then
   mkdir -p "$HOME/.XDG"
   chown abc:abc "$HOME/.XDG"
 fi
+# clean out stale runtime state left behind by unclean shutdowns
+find "$HOME/.XDG" -mindepth 1 -delete
+rm -f /defaults/pid /defaults/native
 printf "$HOME/.XDG" > /run/s6/container_environment/XDG_RUNTIME_DIR
 
 # locale Support
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
index 741e3b45..0c473c52 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
@@ -7,15 +7,16 @@ if [ ! -f '/dev/shm/audio.lock' ]; then
   until [ -f /defaults/pid ]; do
     sleep .5
   done
-  s6-setuidgid abc with-contenv pactl \
+  if s6-setuidgid abc with-contenv pactl \
     load-module module-null-sink \
     sink_name="output" \
-    sink_properties=device.description="output"
-  s6-setuidgid abc with-contenv pactl \
-    load-module module-null-sink \
-    sink_name="input" \
-    sink_properties=device.description="input"
-  touch /dev/shm/audio.lock
+    sink_properties=device.description="output" && \
+    s6-setuidgid abc with-contenv pactl \
+      load-module module-null-sink \
+      sink_name="input" \
+      sink_properties=device.description="input"; then
+    touch /dev/shm/audio.lock
+  fi
 fi
 
 # Setup dev mode if defined