diff --git a/templates/barrier/barrier-ssh-connection@.service.j2 b/templates/barrier/barrier-ssh-connection@.service.j2
index 8776297..2012ac5 100644
--- a/templates/barrier/barrier-ssh-connection@.service.j2
+++ b/templates/barrier/barrier-ssh-connection@.service.j2
@@ -7,7 +7,8 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 ExecStart=sh -c "sleep infinity | ssh $@" ssh -R 24800:localhost:24800 %i\
-  systemctl --user --wait restart barrier-unlock-lockscreen.service;\
+fish -c "\"not test -p .barrier-unlock-lockscreen.fifo && mkfifo .barrier-unlock-lockscreen.fifo; test -p .barrier-unlock-lockscreen.fifo\"";\
+  systemctl --user restart barrier-unlock-lockscreen.service;\
   exec cat > .barrier-unlock-lockscreen.fifo
 
 [Install]