diff --git a/user/blueman-applet.service b/user/blueman-applet.service
index 965b067..f7d187b 100644
--- a/user/blueman-applet.service
+++ b/user/blueman-applet.service
@@ -3,7 +3,7 @@ Description=Blueman Applet
 
 [Service]
 Type=simple
-ExecStartPre=/usr/bin/sh -lc 'until [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; do sleep 0.2; done'
+ExecStartPre=/usr/bin/sh -c 'until [ -n "$WAYLAND_DISPLAY" ] && [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; do sleep 0.2; done'
 ExecStart=/usr/bin/blueman-applet
 Restart=on-failure
 RestartSec=2
diff --git a/user/swww.service b/user/swww.service
index f1c8b2d..78b12eb 100644
--- a/user/swww.service
+++ b/user/swww.service
@@ -5,7 +5,7 @@ PartOf=default.target
 
 [Service]
 Type=simple
-ExecStartPre=/usr/bin/sh -lc 'until [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; do sleep 0.2; done'
+ExecStartPre=/usr/bin/sh -c 'until [ -n "$WAYLAND_DISPLAY" ] && [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; do sleep 0.2; done'
 ExecStart=/usr/bin/swww-daemon
 Restart=on-failure
 RestartSec=1
diff --git a/user/waybar.service b/user/waybar.service
index 740ae3f..3db680c 100644
--- a/user/waybar.service
+++ b/user/waybar.service
@@ -6,7 +6,7 @@ PartOf=default.target
 
 [Service]
 Type=simple
-ExecStartPre=/usr/bin/sh -lc 'until [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; do sleep 0.2; done'
+ExecStartPre=/usr/bin/sh -c 'until [ -n "$WAYLAND_DISPLAY" ] && [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; do sleep 0.2; done'
 ExecStart=/usr/bin/waybar
 Restart=on-failure
 RestartSec=1