diff --git a/sway.conf b/sway.conf
index 9a2fac8..de67a74 100644
--- a/sway.conf
+++ b/sway.conf
@@ -145,7 +145,8 @@ workspace 1 output *
 # Start shepherdd FIRST - it needs to create the socket before HUD/launcher connect
 # Running inside sway ensures all spawned processes use the nested compositor
 # Shepherdd handles SIGHUP for graceful shutdown when sway exits
-exec ./target/debug/shepherdd -c ./config.example.toml
+# If shepherdd fails to start (e.g., config error), exit sway to prevent a broken state
+exec sh -c './target/debug/shepherdd -c ./config.example.toml || swaymsg exit'
 
 # Give shepherdd a moment to initialize, then start UI components
 # Start the shepherd-hud (time remaining overlay)